More Sonar lint cleanup.