more cleanups for CCL and CMUCL