PEP 403/3150 tweaks based on python-ideas discission