Simplify conditional expression

Comment From: wilkinsona

Thanks for the proposal but this doesn't look simpler to me. If anything, I find it slightly harder to read.