re #559: making conditionals more readable