These conditions were added many years ago and they should not be needed
since checkboxes work without this extra complexity