Also replace direct accesses into the type structure to get the return
type of a function with the same function.