SCP: Static Analyzer cleanups suggested by Peter Schorn