Minor formatting tweaks: this version committed to PEPs repo and posted to -dev