Bit of refactoring to avoid promise funcs having to resolve with their input.