I know that OMPI's asm is a carefully crafted set of assembly that works across a broad range of compilers. So what might not be "quite right" for one compiler may actually be there because another compiler needs it.

That being said, if the changes above are for correctness, not neatness/style/etc., I can't speak for that...