Eliminate minor Sonar violations.