More syntax tweaks