Make cl stuff point at cl-lib

This fixes problems for people who don't have `cl` loaded