Reduce complexity in CalcDice