Perhaps I could pull the cl-flet out and replace each (next) with a (cl--loop-parse-next)?