dispatcher: improve rigidity