[issue-313] Syntax tweaks