I finally found the option that controls this: Tools/Options/Text Editor/C/C++/Advanced/Text Editor/Auto Surround Mode. If I set it to "Never", it stops happening. I've decided to set it to "Quotes Only" rather than "Never" as that seems handy at times, assuming I remember it's there. VS should detect that my '<' is not the start of some kind of template parameter list.