PEP8 fixes in the contrib app.  Fixes #1579.