Minor changes to comply with PEP8.

The massive import from the hotfix needed tweaks to be PEP8-compliant.
I also removed superfluous references to t_srs and cleaned up some
comments.