ENH: better unpacking