Commenced refactoring type system.