More parser fixes for #357