BUG-731: simplify boolean expression

This is less obvious, but still as good as the original. Plus it removes
a complaint.

Change-Id: I672a16c41687b319de3918822edc7a4073f5169e
Signed-off-by: Robert Varga <rovarga@cisco.com>