More Python 3 compliant.