Optimised the new unpacker a bit