Fix issue #9 with short notation.

Improved how it handle comments and the positions of outputted braces.