Try to improve a bit the dispatching table design.