Move AVX and non-AVX replication inside a couple multiclasses to avoid repeating each instruction for both individually.