; (B) in subsection (b)(2), by striking subsections (k)(5) and (q) and inserting subsections (k)(5), (q), and (aa) ; (C) in subsection (c)(2), by striking subsections (k)(5) and (q) and inserting subsections (k)(5), (q), and (aa) ; (D) in subsection (d)(2), by adding at the end the following: This paragraph shall apply subject to subsection (aa). ; (E) in subsection (e)(2)(A), by striking subsection (k)(5), subsection (q), and subparagraph (D) of this paragraph and inserting subsection (k)(5), subsection (q), subsection (aa), and subparagraph (D) of this paragraph ; (F) in subsection (f)(2)(A), by striking subsection (k)(5), subsection (q), and subparagraph (D) of this paragraph and inserting subsection (k)(5), subsection (q), subsection (aa), and subparagraph (D) of this paragraph ; (G) in subsection (g)(2), by striking Such and inserting Except as provided in subsections (k)(5) and (aa), such ; (H) in subsection (h)(2)(A), by inserting and subsection (aa) after subparagraphs (B) and (C)