Small tweak, don't merge conditionals, just evaluate each in turn.