Split flushing versus compacting phases of compact.  Cleanup. #1200