Simplify conditional comment formatting

We now treat tags between if-endif conditionals as comments.
This is not ideal, but is significantly better than it was.

Closes #91