Couple more edits for PyPI compatibility.