Improve cl:ed somewhat.