Simplify cleanup of dead (refcount == 0) column families
CallFlushDuringCompaction
Small final fixes before merge