Catch up with Py3k support for dependencies.