Updates and cleanups

Applying latest standards and conventions.  No behavior changes, just cleanups to the:

* meta
* test suite
* lib files

@jcredding ready for review.