Small type refactoring.