Fix todos for unpack.