Pass some more tests (such as they are), so now the refactoring can start in ernest.