More packaging cleanup
Minor cleanup before publication.