BUG-869: simplified if expressions as suggested by Sonar.