Sync syntax changes from current svn repo