Once again switching from UTIs to simple descriptors, as compaction will not be possible with the double-indirection required for UTIs.
Adding a patch to implement mark-compact (as a patch because it's broken)