#2480: Implemented the necessary changes in the evaluators, and removed obsolete code from the phenotypic diversity analyzer.