Make addition and multiplication definitions self-consistent