Rolled back changes from syntactic branch (wish to keep the two branches completely separate for now to make pull requests more sensible)