Improved rendering of if() and comments