Preparing for melpa packaging.

This is mostly cleanup and normalization.