Can we push this `if` into `check-subforms/with-handlers`?