Refactor modify & modifyAndGet to use modifyAndCalc