Adjust CSL fixtures to match latest tweaks.