[bug#65657] first patch mistakes

[chris]

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 the follow-up lint-updated patch sent here 
makes it through 65657 any advice is welcome, thank you.