src: make minor cleanups in multiple files#57448

jasnell wants to merge 2 commits intonodejs:mainnodejs/node:mainfrom

jasnell:jasnell/minor-cleanupsjasnell/node:jasnell/minor-cleanupsCopy head branch name to clipboard