Description: Move class substitution in and out of a function value. (Contributed by NM, 10-Nov-2005)