Delete the *Function variants. These are overall inefficient, in the way they get the name back from the function rather than just passing it in.
Created attachment 107714 [details] The patch No perf impact
fixed in r95318