Up to section 11.2.5. Totally wrecked the test suite.