Change the return type of the evaluators.
Remove some warnings and dead code.
Add a new test. Enhance the documentation.