Added O_BASIC_COMMENT and cleanup the parsers