Implement comment support for final 2 output modes