Also convert a few statements to conform to coding standard for Open MPI. This commit was SVN r15407.