All tests now pass *except* TypeTests

Unfortunately, the errors in TypeTests suggest that something is
critically wrong in the collections code.