Fix remaining Sonar code smells

No match.