Minor Dispatch cleanups. (#498)