V0.9.7: standard shawware compile warnings, code formatting, etc. Fix
code to match.