Cosmetic fixes to make this work with Py3k (as well as with 2.5 still).

Patch by Christian Heimes.