SONARJAVA-397 Fix the last cases (hopefully) of false positives