Updates for PEP 440 support.