Pack things a little more efficiently