Remove erasure logic from defn.ContextFunctionType
#18466
Merged
defn.ContextFunctionType
#18466