Some cleanup.
Automatic Py3k merge for testing