More refactoring of return type placement