Fix bug 436, and include a lint change.

Sorry, I meant to put the 436 fix in another branch, but the commit history will be OK.