Replace various uses of HandlerBase.
Purge caller.h and some related code.