Move comma_terminates global to parser_state