More progress toward being python 3 compatible.