[Bernie Harris]

Thank you for the reply. I have revised the patch to apply to the range of 
tunnel types, and so only the opt field is cleared.