; (B) by redesignating paragraphs (3) through (5) as paragraphs (1) through (3), respectively; and (C) in paragraph (3) (as so redesignated)— (i) in subparagraph (B), by adding and at the end; (ii) by striking subparagraph (C); and (iii) by redesignating subparagraph (D) as subparagraph (C); and (2) in subsection (b)— (A) in paragraph (1)— (i) in subparagraph (A)(vi), by striking measures and all that follows through (a)(1) and inserting measures ; (ii) in subparagraph (B), by adding and at the end; (iii) in subparagraph (C), by striking and at the end; and (iv) by striking subparagraph (D); and (B) in paragraph (3), by striking subsection (a)(3) and inserting subsection (a)(1) .