Fix some code smells found by SonarQube.

1 job for fix-misc-sonarqube-code-smells in 6 minutes and 1 second (queued for 5 seconds)