Miscellaneous code-quality improvements. (#5860)

Does what it do.

Co-authored-by: devil-ira <justthecooldude@gmail.com>