Improved significantly on syntax error recovery
Cleaned up some mess caused by trying to fix a non-existant error.