More pmg deprecation fixes.
Automatic Py3k merge for testing