[py3k] More Python 3 fixes. (Issue #123)