Minor code improvements

Added an implementation of `CompletedEvaluator` instead of relying on anonymous inner classes.