Rough possible modifications to pandas_query_clean.