Move more ops out of check.clj