F69: Improve GvinCalculator.