Small code cleanup from static analysis.