More parser updates from Nick