The primary purpose of this pull request appears to be to address (2) bugs, not superficial cleanup prior to release.  Merging and closing related issues, just noting.