Additional syntax tweaks