; (B) in subsection (b)(5), by striking subsection (a) in subparagraph (A) and inserting subsection (a) of this section and subsections (a)(2)(B) and (b) of section 805 , and by striking subsection (a) in subparagraph (B) and inserting subsection (a) of this section or subsection (a)(2)(B) or (b) of section 805