This is @stouset's change, in the commit I just pushed I broke it into several indented lines as you will see. We can change to if conditions if that's more effective/desired.