Unified SQL parser even further