Minor Python 2 / 3 cleanup.