`autoevals` is the only package that depends on it, so we can just move
the class definitions into the autoevals package.