General syntax tweaks