; and (iii) by striking surviving divorced wife and inserting surviving divorced spouse ; (G) in subsection (q)— (i) in paragraph (1)— (I) by striking wife’s, husband’s, widow’s, or widower’s and inserting spouse’s, or surviving spouse’s ; and (II) in subparagraph (A)— (aa) by striking wife’s or husband’s and inserting spouse’s ; and (bb) by striking widow’s or widower’s and inserting surviving spouse’s ; (ii) in paragraph (3)— (I) in subparagraph (A)— (aa) by striking wife’s, husband’s, widow’s, or widower’s and inserting spouse’s or surviving spouse’s ; (bb) by striking wife’s or husband’s and inserting spouse’s ; and (cc) by striking widow’s or widower’s and inserting surviving spouse’s ; (II) in the matter following subparagraph (A)(ii), by striking wife’s, husband’s, widow’s, or widower’s and inserting spouse’s or surviving spouse’s ; (III) in subparagraph (B), by striking wife’s or husband’s each place such term appears and inserting spouse’s ; (IV) in subparagraph (C), by striking wife’s, husband’s, widow’s, or widower’s each place such term appears and inserting spouse’s or surviving spouse’s ; (V) in subparagraph (D), by striking wife’s, husband’s, widow’s, or widower’s and inserting spouse’s or surviving spouse’s ; and (VI) in subparagraph (E), by striking widow’s or widower’s each place such term appears and inserting surviving spouse ; (iii) in paragraph (5)— (I) by striking wife’s or husband’s each place such word appears and inserting spouse’s ; and (II) in subparagraph (D), by striking widow’s or widower’s and inserting surviving spouse’s ; (iv) in paragraph (6)— (I) by striking wife’s, husband’s, widow’s, or widower’s and inserting spouse’s, or surviving spouse’s ; and (II) in subparagraph (A)— (aa) in clause (ii), by striking wife’s or husband’s and inserting spouse’s ; and (bb) in clause (iii), by striking widow’s or widower’s and inserting surviving spouse’s ; (v) in paragraph (7)— (I) by striking wife’s, husband’s, widow’s, or widower’s and inserting spouse’s, or surviving spouse’s