Merge pull request #1348 from billhollings/maintainability-changes

Miscellaneous non-functional maintainability updates.