diff --git a/src/backend/distributed/planner/multi_explain.c b/src/backend/distributed/planner/multi_explain.c
index c719956f0..3cba3a695 100644
--- a/src/backend/distributed/planner/multi_explain.c
+++ b/src/backend/distributed/planner/multi_explain.c
@@ -540,26 +540,26 @@ BuildRemoteExplainQuery(char *queryString, ExplainState *es)
 		case EXPLAIN_FORMAT_XML:
 		{
 			formatStr = "XML";
+			break;
 		}
-		break;
 
 		case EXPLAIN_FORMAT_JSON:
 		{
 			formatStr = "JSON";
+			break;
 		}
-		break;
 
 		case EXPLAIN_FORMAT_YAML:
 		{
 			formatStr = "YAML";
+			break;
 		}
-		break;
 
 		default:
 		{
 			formatStr = "TEXT";
+			break;
 		}
-		break;
 	}
 
 	appendStringInfo(explainQuery,
diff --git a/src/backend/distributed/planner/shard_pruning.c b/src/backend/distributed/planner/shard_pruning.c
index 90babc333..7d32ad09e 100644
--- a/src/backend/distributed/planner/shard_pruning.c
+++ b/src/backend/distributed/planner/shard_pruning.c
@@ -632,8 +632,8 @@ AddPartitionKeyRestrictionToInstance(ClauseWalkerContext *context, OpExpr *opCla
 					prune->lessConsts = constantClause;
 				}
 				matchedOp = true;
+				break;
 			}
-			break;
 
 			case BTLessEqualStrategyNumber:
 			{
@@ -645,8 +645,8 @@ AddPartitionKeyRestrictionToInstance(ClauseWalkerContext *context, OpExpr *opCla
 					prune->lessEqualConsts = constantClause;
 				}
 				matchedOp = true;
+				break;
 			}
-			break;
 
 			case BTEqualStrategyNumber:
 			{
@@ -662,8 +662,8 @@ AddPartitionKeyRestrictionToInstance(ClauseWalkerContext *context, OpExpr *opCla
 					prune->evaluatesToFalse = true;
 				}
 				matchedOp = true;
+				break;
 			}
-			break;
 
 			case BTGreaterEqualStrategyNumber:
 			{
@@ -676,8 +676,8 @@ AddPartitionKeyRestrictionToInstance(ClauseWalkerContext *context, OpExpr *opCla
 					prune->greaterEqualConsts = constantClause;
 				}
 				matchedOp = true;
+				break;
 			}
-			break;
 
 			case BTGreaterStrategyNumber:
 			{
@@ -689,15 +689,15 @@ AddPartitionKeyRestrictionToInstance(ClauseWalkerContext *context, OpExpr *opCla
 					prune->greaterConsts = constantClause;
 				}
 				matchedOp = true;
+				break;
 			}
-			break;
 
 			case ROWCOMPARE_NE:
 			{
 				/* TODO: could add support for this, if we feel like it */
 				matchedOp = false;
+				break;
 			}
-			break;
 
 			default:
 				Assert(false);
diff --git a/src/backend/distributed/transaction/transaction_management.c b/src/backend/distributed/transaction/transaction_management.c
index a0d14d9b0..a1212a43a 100644
--- a/src/backend/distributed/transaction/transaction_management.c
+++ b/src/backend/distributed/transaction/transaction_management.c
@@ -168,8 +168,8 @@ CoordinatedTransactionCallback(XactEvent event, void *arg)
 			XactModificationLevel = XACT_MODIFICATION_NONE;
 			dlist_init(&InProgressTransactions);
 			CoordinatedTransactionUses2PC = false;
+			break;
 		}
-		break;
 
 		case XACT_EVENT_ABORT:
 		{
@@ -204,14 +204,15 @@ CoordinatedTransactionCallback(XactEvent event, void *arg)
 			dlist_init(&InProgressTransactions);
 			CoordinatedTransactionUses2PC = false;
 			subXactAbortAttempted = false;
+			break;
 		}
-		break;
 
 		case XACT_EVENT_PARALLEL_COMMIT:
 		case XACT_EVENT_PARALLEL_ABORT:
 		case XACT_EVENT_PREPARE:
-		{ }
-		  break;
+		{
+			break;
+		}
 
 		case XACT_EVENT_PRE_COMMIT:
 		{
@@ -270,8 +271,8 @@ CoordinatedTransactionCallback(XactEvent event, void *arg)
 			 * committed. This handles failure at COMMIT/PREPARE time.
 			 */
 			PostCommitMarkFailedShardPlacements(CoordinatedTransactionUses2PC);
+			break;
 		}
-		break;
 
 		case XACT_EVENT_PARALLEL_PRE_COMMIT:
 		case XACT_EVENT_PRE_PREPARE:
@@ -282,8 +283,8 @@ CoordinatedTransactionCallback(XactEvent event, void *arg)
 								errmsg("cannot use 2PC in transactions involving "
 									   "multiple servers")));
 			}
+			break;
 		}
-		break;
 	}
 }