Cleaned up dispatcher design.