Changing types.

More refactoring.