More parser overhauling.