Improved support for comment folding