Change verbose output when not applying additional shift.
Minor formatting changes.
Add clang static analyzer support, address what it complains about.
Merge branch 'base'
Fixed complaints of clang static analyzer.