Ensure public vars reference public types#2180

meatballhat merged 2 commits intomainurfave/cli:mainfrom

consistent-public-defaults-and-moreurfave/cli:consistent-public-defaults-and-moreCopy head branch name to clipboard