Combine all the handlers, there aren't that many and will soon get simpler.