Stop reimplementing a bunch of cl- functions in ert