More accurate description of an HTTP read error, make pyflakes happy.
Housekeeping and cleanup, some minor argument name changes.