[issue-311] Syntax tweaks