Fix ordering when mixing comment types