Some unpacking efficiencies