[issue-305] Syntax tweaks