Remove getType() from Type class, refactor.