More PEP updates.
3156 has also been committed.