The definitions take up a lot of space which makes it hard to see the dispatcher class, so break them out.
