; and (iii) by striking subparagraphs (E) and (F); and (B) in paragraph (8)— (i) in subparagraph (C), by adding and at the end; (ii) in subparagraph (D), by striking the semicolon at the end and inserting a period; and (iii) by striking subparagraphs (E) and (F); and (2) in section 36(a)— (A) in paragraph (3), by adding and at the end; (B) in paragraph (4), by striking the semicolon at the end and inserting a period