; and (2) in subsection (c)(2)(B)— (A) by striking section 2(9)(a) and inserting section 2(a)(9)(A) ; and (B) by striking 33 U.S.C. 1901(9)(a) and inserting 33 U.S.C. 1901(a)(9)(A) . (j) Section 12113(d)(2)(C)(iii) of title 46, United States Code, is amended by striking 118 Stat. 2887) and inserting 118 Stat. 2887)) . (k) Section 13107(c)(2) of title 46, United States Code, is amended by striking On or after October 1, 2016, no and inserting No . (l) Section 31322(a)(4)(B) of title 46, United States Code, is amended by striking state and inserting State . (m) Section 52101(d) of title 46, United States Code, is amended by striking ( 50 App. U.S.C. 459(a) ) and inserting ( 50 U.S.C. 3808(a) ) . (n) The analysis for chapter 531 of title 46, United States Code, is amended by striking the item relating to section 53109: (o) Section 53106(a)(1) of title 46, United States Code, is amended by striking subparagraphs (A), (B), (C), and (D), and by redesignating subparagraphs (E), (F), and (G) as subparagraphs (A), (B), and (C), respectively. (p) Section 53111 of title 46, United States Code, is amended by striking paragraphs (1) through (4), and by redesignating paragraphs (5), (6), and (7) as paragraphs (1), (2), and (3), respectively. (q) Section 53501 of title 46, United States Code, is amended— (1) in paragraph (5)(A)(iii), by striking transportation trade trade or and inserting transportation trade or ; (2) by redesignating paragraph (8) as paragraph (9); (3) by striking the second paragraph (7) (relating to the definition of United States foreign trade )