Cleanup type mismatches
Get rid of es_str_t in extra data for parsers