Improve support for handlebars comments

I think this should work, but please review :smile: