I know you're cleaning up existing code but I'm not a fan of `unless ... or` because it's hard to remember which way the conditionals resolve.