Trivial unpacker and minor cleanups.