Sections 20 and 20A are amended as follows.

For “Agency”, in each place where it occurs, substitute “ appropriate agency ”.

In subsection (1) of each of those sections, in the closing words, after “section 6(2)” insert “ or, as the case may be, section 6(2A) ”.