More cleanup of SonarQube issues.