Fixed support for CCL (and potentially others).