Update the incorrect comment on when function was introduced.
Redo instance to be more efficient (see #8778, #9203)