Move sister functions into proximity
Rename argument for consistency

--HG--
extra : amend_source : 006c17fc01743ef7f646bf54a166cbaeae92ab75
Add a vendored copy of packaging
Implement PEP 440 by using the packaging library