Index: trunk/src/wp-includes/html-api/class-wp-html-processor.php
===================================================================
--- trunk/src/wp-includes/html-api/class-wp-html-processor.php	(revision 63790)
+++ trunk/src/wp-includes/html-api/class-wp-html-processor.php	(revision 64250)
@@ -1586,5 +1586,4 @@
 				}
 				goto initial_anything_else;
-				break;
 
 			/*
@@ -1679,5 +1678,4 @@
 				}
 				goto before_html_anything_else;
-				break;
 
 			/*
@@ -1701,5 +1699,4 @@
 				 */
 				goto before_html_anything_else;
-				break;
 		}
 
@@ -1761,5 +1758,4 @@
 				}
 				goto before_head_anything_else;
-				break;
 
 			/*
@@ -1806,5 +1802,4 @@
 			case '-HTML':
 				goto before_head_anything_else;
-				break;
 		}
 
@@ -1862,5 +1857,4 @@
 
 				goto in_head_anything_else;
-				break;
 
 			/*
@@ -1994,5 +1988,4 @@
 				 */
 				goto in_head_anything_else;
-				break;
 
 			/*
@@ -2087,5 +2080,4 @@
 
 				goto in_head_noscript_anything_else;
-				break;
 
 			/*
@@ -2191,5 +2183,4 @@
 				}
 				goto after_head_anything_else;
-				break;
 
 			/*
@@ -2280,5 +2271,4 @@
 				 */
 				goto after_head_anything_else;
-				break;
 		}
 
@@ -2784,26 +2774,25 @@
 					$this->state->stack_of_open_elements->remove_node( $node );
 					return true;
-				} else {
-					/*
-					 * > If the stack of open elements does not have a form element in scope,
-					 * > then this is a parse error; return and ignore the token.
-					 *
-					 * Note that unlike in the clause above, this is checking for any FORM in scope.
-					 */
-					if ( ! $this->state->stack_of_open_elements->has_element_in_scope( 'FORM' ) ) {
-						// Parse error: ignore the token.
-						return $this->step();
-					}
-
-					$this->generate_implied_end_tags();
-
-					if ( ! $this->state->stack_of_open_elements->current_node_is( 'FORM' ) ) {
-						// @todo Indicate a parse error once it's possible. This error does not impact the logic here.
-					}
-
-					$this->state->stack_of_open_elements->pop_until( 'FORM' );
-					return true;
-				}
-				break;
+				}
+
+				/*
+				 * > If the stack of open elements does not have a form element in scope,
+				 * > then this is a parse error; return and ignore the token.
+				 *
+				 * Note that unlike in the clause above, this is checking for any FORM in scope.
+				 */
+				if ( ! $this->state->stack_of_open_elements->has_element_in_scope( 'FORM' ) ) {
+					// Parse error: ignore the token.
+					return $this->step();
+				}
+
+				$this->generate_implied_end_tags();
+
+				if ( ! $this->state->stack_of_open_elements->current_node_is( 'FORM' ) ) {
+					// @todo Indicate a parse error once it's possible. This error does not impact the logic here.
+				}
+
+				$this->state->stack_of_open_elements->pop_until( 'FORM' );
+				return true;
 
 			/*
@@ -3367,8 +3356,4 @@
 			return $this->in_body_any_other_end_tag();
 		}
-
-		$this->bail( 'Should not have been able to reach end of IN BODY processing. Check HTML API code.' );
-		// This unnecessary return prevents tools from inaccurately reporting type errors.
-		return false;
 	}
 
@@ -3419,6 +3404,4 @@
 
 		$this->bail( 'Should not have been able to reach end of "any other end tag" IN BODY processing. Check HTML API code.' );
-		// This unnecessary return prevents tools from inaccurately reporting type errors.
-		return false;
 	}
 
@@ -3497,5 +3480,4 @@
 					// Non-whitespace would trigger fostering, unsupported at this time.
 					$this->bail( 'Foster parenting is not supported.' );
-					break;
 				}
 				break;
@@ -3822,5 +3804,4 @@
 
 				goto in_column_group_anything_else;
-				break;
 
 			/*
@@ -4383,5 +4364,4 @@
 				}
 				goto after_body_anything_else;
-				break;
 
 			/*
@@ -4706,5 +4686,4 @@
 				}
 				goto after_after_body_anything_else;
-				break;
 		}
 
@@ -4985,18 +4964,16 @@
 			}
 			return true;
-		}
-
-		/*
-		 * > An end tag whose name is "script", if the current node is an SVG script element.
-		 */
-		if ( $this->is_tag_closer() && 'SCRIPT' === $this->state->current_token->node_name && 'svg' === $this->state->current_token->namespace ) {
-			$this->state->stack_of_open_elements->pop();
-			return true;
-		}
-
-		/*
-		 * > Any other end tag
-		 */
-		if ( $this->is_tag_closer() ) {
+		} else {
+			/*
+			 * > An end tag whose name is "script", if the current node is an SVG script element.
+			 */
+			if ( 'SCRIPT' === $this->state->current_token->node_name && 'svg' === $this->state->current_token->namespace ) {
+				$this->state->stack_of_open_elements->pop();
+				return true;
+			}
+
+			/*
+			 * > Any other end tag
+			 */
 			$node = $this->state->stack_of_open_elements->current_node();
 			if ( $tag_name !== $node->node_name ) {
@@ -5098,8 +5075,4 @@
 			}
 		}
-
-		$this->bail( 'Should not have been able to reach end of IN FOREIGN CONTENT processing. Check HTML API code.' );
-		// This unnecessary return prevents tools from inaccurately reporting type errors.
-		return false;
 	}
 
@@ -6389,6 +6362,4 @@
 
 		$this->bail( 'Should not have reached end of HTML Integration Point detection: check HTML API code.' );
-		// This unnecessary return prevents tools from inaccurately reporting type errors.
-		return false;
 	}