unpack_return still used in some funcs.