I think #8439 offers a nicer way (== ends up in more readable and maintainable code) to accomplish the same thing for two of the functions: provide "compatibility macros" so that we don't have to do embedded #ifdefs as much.

That is look reasonable. The goal of the PR is removed scope_id from connectdata and UserDefined structures . I am going to rebase my PR to use your changes.

ok, cool! I'll merge #8439 and then it'll be easier

Thanks!