Merge pull request #181 from jow-/syntax-as-from-not-reserved

Merge pull request #181 from jow-/syntax-as-from-not-reserved #525