Improved unpackers.