py3: more Python 3 compatibility in un-tested code