diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c
index 1cf4d5f7c..451ac9900 100644
--- a/ofproto/ofproto-dpif-xlate.c
+++ b/ofproto/ofproto-dpif-xlate.c
@@ -242,15 +242,16 @@ struct xlate_ctx {
      * tables in strictly monotonically increasing order don't contribute to
      * 'depth' because they cannot cause a flow translation to take an infinite
      * amount of time (because the number of tables is finite).  Translation
-     * aborts when 'depth' exceeds MAX_DEPTH.
+     * hard stop occurs when 'depth' exceeds MAX_DEPTH.
      *
      * 'resubmits', on the other hand, prevents flow translation from
-     * performing an extraordinarily large while still finite amount of work.
-     * It counts the total number of resubmits (and a few other activities)
-     * that have been executed.  Returning from a resubmit does not affect this
-     * counter.  Thus, this limits the amount of work that a particular
-     * translation can perform.  Translation aborts when 'resubmits' exceeds
-     * MAX_RESUBMITS (which is much larger than MAX_DEPTH).
+     * performing an extraordinarily large while still finite amount of
+     * work.  It counts the total number of resubmits (and a few other
+     * activities) that have been executed.  Returning from a resubmit does
+     * not affect this counter.  Thus, this limits the amount of work that
+     * a particular translation can perform.  Translation hard stop occurs
+     * when 'resubmits' exceeds MAX_RESUBMITS (which is much larger than
+     * MAX_DEPTH).
      */
     int depth;                  /* Current resubmit nesting depth. */
     int resubmits;              /* Total number of resubmits. */
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index f59d69c4d..d0c070372 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -5102,10 +5102,9 @@ group_dpif_credit_stats(struct group_dpif *group,
 /* Calculate the dp_hash mask needed to provide the least weighted bucket
  * with at least one hash value and construct a mapping table from masked
  * dp_hash value to group bucket using the Webster method.
- * If the caller specifies a non-zero max_hash value, abort and return false
- * if more hash values would be required. The absolute maximum number of
- * hash values supported is 256. */
-
+ * If the caller specifies a non-zero max_hash value, hard stop and return
+ * false if more hash values would be required. The absolute maximum number
+ * of hash values supported is 256. */
 #define MAX_SELECT_GROUP_HASH_VALUES 256
 
 static bool