Bug 11170: (follow-up) improve a bit of unnecessarily convoluted logic