Cleanup "Sonar" warnings.