Improved support for comments