Fixed #23539 -- replace references to extra, min_num, max_num with their
respective hooks