Switch to using shortstop-handlers and add support for require and exec handlers.