More parser clean up.