Make lots of fixes to handle the most complex case of reorganising
of partitions where two-phased processes are needed in some cases.