Unify syntax parsing, fixes #249