Continuation of RippleCalc refactoring.