Restructuring of EC types and initialisers.