Refactoring evaluation to use Measurement.
Refactoring evaluation of Observation.