WIP: Simplify and fix operand unpacking