Fix a compile of harmless static analyzer warnings.
Fix a harmless "scan-build" compiler warning in the command-line shell.