Misc syntax improvements.