This commit also slightly refines nullness but without significant user-side impact expected. Closes gh-34525