Fix problems with nested comments