Minor EDCM fixes.
Further EDCM modernisation - experimental use of Columnsets.