More clean-up from results of static analysis.