Renamed.
Using absolute_import for py3k.
Some other py3k changes.