MAGETWO-99488: Eliminate @escapeNotVerified in Tax-related Modules

Author: eug123

app/code/Magento/Tax/view/frontend/templates/checkout/grandtotal.phtml

@@ -10,11 +10,11 @@
  * @var $block \Magento\Tax\Block\Checkout\Grandtotal
  */
 ?>
+<?php
+$style = $block->escapeHtmlAttr($block->getStyle());
+$colspan = (int)$block->getColspan();
+?>
 <?php if ($block->includeTax() && $block->getTotalExclTax() >= 0) : ?>
-    <?php
-        $style = $block->escapeHtmlAttr($block->getStyle());
-        $colspan = (int)$block->getColspan();
-    ?>
     <tr class="grand totals excl">
         <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
             <strong><?= $block->escapeHtml(__('Grand Total Excl. Tax')) ?></strong>

app/code/Magento/Tax/view/frontend/templates/checkout/subtotal.phtml

@@ -11,11 +11,11 @@
  * @see \Magento\Tax\Block\Checkout\Subtotal
  */
 ?>
+<?php
+$style = $block->escapeHtmlAttr($block->getStyle());
+$colspan = (int)$block->getColspan();
+?>
 <?php if ($block->displayBoth()) : ?>
-    <?php
-        $style = $block->escapeHtmlAttr($block->getStyle());
-        $colspan = (int)$block->getColspan();
-    ?>
 <tr class="totals sub excl">
     <th style="<?= /* @noEscape */ $style ?>" class="mark" colspan="<?= /* @noEscape */ $colspan ?>" scope="row">
         <?= $block->escapeHtml(__('Subtotal (Excl. Tax)')) ?>