Issue 21469: Minor code modernization (convert and/or expression to an if/else expression).

Suggested by: Tal Einat