Fix the RRF distinct arithmetic / bitwise op helpers