somewhat cleaner sonar violations.