Fix comments for #3160
Merge pull request #3219 from IgorStepanov/cppmanglewindows2

Fix comments for #3160
Hack around vtable emission problems
Do not put comments between the if body and 'else'
Expand huge if condition
Move comments from conditions
Clean up comments inside expressions
Don't put comments inside if conditions
Move another comment out of an if condition