Compaction changes.

More compaction changes.