Misc syntax tweaks