can collapse this into previous `when` with an `||`