Split unpack into a dedicated header