Update server to be more flexible about what is a handler.