Implement optional support for line and block comments