fix "surround with comment" for XAML; fix exception in XAML CC occurring when trying to type '<'