Nitpicky refactoring -- use of nullptr and auto, made a bit more const-correct. No functional changes intended.