Fix some minor static analysis suggestions.