I'm :-1: on `unless ... or` as I find it hard to work out which way the `or` goes. Could use use `if` instead? I know this isn't your change.