Minor dataspace cleanup.