Fix behavior of enumerate(simd,simd) to be coherent with old arith function
Restore correct hierarchies for SWAR functions