First round of Py3k updates for custodian.