Apply results of running 'python-modernize'.

As well as additional fixups on the way toward "stradding" Python2 / Py3k.
Yep -- they return iterable objects.  Trying to preserve the semantics means you either wrap them in `list()`, or convert to the equivalent comprehensions.