Improve support for CCL.