Performance tweaks for unpack()