Revert "Code review tweaks"

This reverts commit 285bd8c.

dataflow/src/main/java/org/checkerframework/dataflow/cfg/builder/CFGTranslationPhaseOne.java

@@ -620,7 +620,7 @@ public Node visitBindingPattern17(Tree bindingPatternTree, Void p) {
    * Visit a DeconstructionPatternTree.
    *
    * @param deconstructionPatternTree a DeconstructionPatternTree, typed as Tree so the Checker
-   *     Framework compiles under JDK 20 and earlier
+   *     Framework compiles under JDK < 21
    * @param p an unused parameter
    * @return the result of visiting the tree
    */
@@ -2357,6 +2357,7 @@ private SwitchBuilder(Tree switchTree) {
 
       // Build CFG for the cases.
       int defaultIndex = -1;
+      boolean exhaustiveAndNoDefault = exhaustiveAndNoDefault();
       for (int i = 0; i < numCases; ++i) {
         CaseTree caseTree = caseTrees.get(i);
         if (TreeUtils.isDefaultCaseTree(caseTree)) {
@@ -2365,9 +2366,7 @@ private SwitchBuilder(Tree switchTree) {
           // build the default case last.
           defaultIndex = i;
         } else {
-          boolean isLastCase = (i == numCases - 1);
-          boolean isLastCaseAndNoDefault = isLastCase && defaultIndex == -1;
-          boolean isLastCaseOfExhaustive = isLastCaseAndNoDefault && exhaustiveAndNoDefault();
+          boolean isLastCaseOfExhaustive = (i == numCases - 1) && exhaustiveAndNoDefault;
           buildCase(caseTree, i, isLastCaseOfExhaustive);
         }
       }