Another `clojure.set/rename` cleanup, plus fix a duplicate test