PEP 476: Updates based on feedback from python-dev