PEP 8 and Python 3.3 fixes from private repository.