More fixes to comment header coloring