Further SGRiskEvaluator refactoring