Further cleanups of RippleCalc.