Changes due to PEP 426 changes.