Polishing solution.  Fixing improvements from static analysis.