Dropped CDF data format
Small Code-Optimizer-recommended fixes.