Adding analysis code, and cleaning up some messes in the parse tests.