Changes required by upstream renaming of nrepl.el to cider