Cleaning up refactoring issues and fixing new parser bugs.