Also a bit of clean up to shut up a false-positive in Coverity (and clangd) on dereferencing a possibly (not) nullptr.