Update to handle combined CEL switch and LUT format.