Simplify logic for readability and maintainability.

[rchatham]

Describe your changes

This code is equivalent and simpler.

Issue ticket number and link

Checklist before requesting a review

• [x] I have performed a self-review of my code
• [x] If it is a core feature, I have added thorough tests.
• [ ] Do we need to implement analytics?
• [ ] Will this be part of a product update? If yes, please write one phrase about this update.