[issue-309] Syntax tweaks