Finished updates for py3k-compatible codebase.