Merge pull request #2596 from abarth/rm_closure

Use a member function instead of an anonymous closure