[bug#65657] first patch mistakes

[Christopher DePauw]

I sent an email to close this issue 65657 in favor of 65658, but the email did not appear on the issue page for 65657 and in the meantime someone else closed 65658 in favor of 65657. I hope this lint-updated patch makes it through 65657 any advice is welcome, thank you.