Fix a number of ICE in the test suite.