Fix more messages the new pylint found.
    
    Most of these are obvious.  The lambda-related ones are to make sure the
    variable in question is looked up in the right scope.