Resolve "Run analysis tools to prepare for release"

Some fixes that resulted from running the test suite under various analysis tools.

Closes #120 (closed).