Add duplicate, but less confusing unpacks to match the packs already there.

What appears to have happened is we changed only the non-internal setup.  So
technically this isn't needed, but does help with handling confusion later.