Refactor things to isolate ClhepEvaluator in one single place.