Fix run-time inclusion of cl
Fix some miss-namings
Extract simp-project-rgrep-dwim-thing