[ub] cleanups and feedback from initial reviewers#8739

notadragon wants to merge 5 commits intocplusplus:ub-ifndrcplusplus/draft:ub-ifndrfrom

notadragon:ub-ifndr-cwgreview1notadragon/cplusplus_draft:ub-ifndr-cwgreview1Copy head branch name to clipboard