Commented and made sdist do the right thing.

Also minor cleanup.