Add support for multiple adhocctl handlers, and clean up how we call them slightly.