I think this `if` is unnecessary, right ?

I'm quite happy with the simple name change messageClass -> delivery, this is simple and feels good, we can keep it.