Changes to support PEP 440 version matching.