Comment 64 for bug 893091

Created attachment 54294
Additional patch to clean some things up

This is a small follow-on patch to 26420.diff which just cleans up a few idioms based on some comments to my blog post http://www.wefearchange.org/2011/12/lessons-in-porting-to-python-3.html

Also, this includes a small fix for a compilation error that someone on arch linux reported, but which I can't reproduce on Ubuntu. It should at least get rid of the error but doesn't have any other effect.

Apply this on top of my previous diff. I'm still trying to get github to not hate me so I can push a branch.