Refactoring types.