[PATCH mock] Fixup of *pack() methods