Make syntaxes more 0.9.2-like
Merge pull request #277 from Morphan1/master

Make syntaxes more 0.9.2-like...