More refactoring of Arg/Return types.