More parser work on error messages and calls