Issue #2474: Hides the comments and keywords

Retry. This time should be all fine from diff perspective ;)