Further cleanup of the "cl-" namespace. Fit CL in 80 columns.