Fix a couple of warnings about explicit distribution of arithmetic operators