Getting rid of superfluous cached references. Only need
the evaluators.
Doxygen comment fix.