Switch over to having different variants for sums and products rather than a tuple of adder and multiplier