Bug 27205: Improve logic readability in conditional