; (B) in subparagraph (A), in the matter preceding clause (i), by striking who is a national or habitual resident of a country that is contiguous with the United States shall be treated in accordance with subparagraph (B) and inserting shall be treated in accordance with this paragraph or subsection (b), as applicable ; (C) in subparagraph (B)— (i) by redesignating clauses (i) and (ii) as subclauses (I) and (II), and moving the subclauses two ems to the right; (ii) in the matter preceding subclause (I), as so redesignated, by striking An immigration officer and inserting the following: (i) In general An immigration officer