Some cleanups in the dispatch bindings.