While reviewing Mike's work, I saw some small items flagged by the
linter that I felt comfortable fixing. Also threw in some line
wrapping.