More parser tweaks, more setup for semantic analysis.