Compaction again

This is one part of the resolution for #37.