#23 Minor tidy-up of HeuristicScoreInfo