Superficial changes to Tools::PairEnergy class.