Type parsing now working again. Passing the test suite.