Apply results of running 'python-modernize'.

As well as additional fixups on the way toward "stradding" Python2 / Py3k.
so i know this is modernize making the decisions -- but do you know why it's dropping `map`/`filter` for comprehensions?