CL extensions, extension sorting and minor struct code layout fix.