diff --git a/ompi/mpi/c/testall.c b/ompi/mpi/c/testall.c
index a9791636417..e9b357d8530 100644
--- a/ompi/mpi/c/testall.c
+++ b/ompi/mpi/c/testall.c
@@ -66,8 +66,9 @@ int MPI_Testall(int count, MPI_Request requests[], int *flag,
                     rc = MPI_ERR_REQUEST;
                     break;
                 }
-                if (requests[i] == &ompi_request_empty) continue;
-                else if (check_req == NULL) {
+                if (requests[i] == &ompi_request_empty) {
+                    continue;
+                } else if (check_req == NULL) {
                     check_req = requests[i];
                 }
                 else {
diff --git a/ompi/mpi/c/testany.c b/ompi/mpi/c/testany.c
index 8a54453f327..e4dd3d26ed6 100644
--- a/ompi/mpi/c/testany.c
+++ b/ompi/mpi/c/testany.c
@@ -65,8 +65,9 @@ int MPI_Testany(int count, MPI_Request requests[], int *indx, int *completed, MP
                     rc = MPI_ERR_REQUEST;
                     break;
                 }
-                if (requests[i] == &ompi_request_empty) continue;
-                else if (check_req == NULL) {
+                if (requests[i] == &ompi_request_empty) {
+                    continue;
+                } else if (check_req == NULL) {
                     check_req = requests[i];
                 }
                 else {
diff --git a/ompi/mpi/c/testsome.c b/ompi/mpi/c/testsome.c
index 857d1600659..ea71f681d9e 100644
--- a/ompi/mpi/c/testsome.c
+++ b/ompi/mpi/c/testsome.c
@@ -67,8 +67,9 @@ int MPI_Testsome(int incount, MPI_Request requests[],
                     rc = MPI_ERR_REQUEST;
                     break;
                 }
-                if (requests[indx] == &ompi_request_empty) continue;
-                else if (check_req == NULL) {
+                if (requests[indx] == &ompi_request_empty) {
+                    continue;
+                } else if (check_req == NULL) {
                     check_req = requests[indx];
                 }
                 else {
diff --git a/ompi/mpi/c/waitall.c b/ompi/mpi/c/waitall.c
index 88610df99c2..a636cf74263 100644
--- a/ompi/mpi/c/waitall.c
+++ b/ompi/mpi/c/waitall.c
@@ -64,8 +64,9 @@ int MPI_Waitall(int count, MPI_Request requests[], MPI_Status statuses[])
                     rc = MPI_ERR_REQUEST;
                     break;
                 }
-                if (requests[i] == &ompi_request_empty) continue;
-                else if (check_req == NULL) {
+                if (requests[i] == &ompi_request_empty) {
+                    continue;
+                } else if (check_req == NULL) {
                     check_req = requests[i];
                 }
                 else {
diff --git a/ompi/mpi/c/waitany.c b/ompi/mpi/c/waitany.c
index 95ec36104e0..7192bc43590 100644
--- a/ompi/mpi/c/waitany.c
+++ b/ompi/mpi/c/waitany.c
@@ -65,8 +65,9 @@ int MPI_Waitany(int count, MPI_Request requests[], int *indx, MPI_Status *status
                     rc = MPI_ERR_REQUEST;
                     break;
                 }
-                if (requests[i] == &ompi_request_empty) continue;
-                else if (check_req == NULL) {
+                if (requests[i] == &ompi_request_empty) {
+                    continue;
+                } else if (check_req == NULL) {
                     check_req = requests[i];
                 }
                 else {
diff --git a/ompi/mpi/c/waitsome.c b/ompi/mpi/c/waitsome.c
index 768a5af409f..12c86c6c06f 100644
--- a/ompi/mpi/c/waitsome.c
+++ b/ompi/mpi/c/waitsome.c
@@ -67,8 +67,9 @@ int MPI_Waitsome(int incount, MPI_Request requests[],
                     rc = MPI_ERR_REQUEST;
                     break;
                 }
-                if (requests[indx] == &ompi_request_empty) continue;
-                else if (check_req == NULL) {
+                if (requests[indx] == &ompi_request_empty) {
+                    continue;
+                } else if (check_req == NULL) {
                     check_req = requests[indx];
                 }
                 else {