Rework handling of recursive function types.