More parser improvements.