Refine support for result unpacking