; and (2) in paragraph (2), by inserting , in the case of educational assistance under chapter 30 of such title, and section 16131(k), in the case of educational assistance under chapter 1606 of this title before the period at the end.