More cleanup.
Removed test that's no longer relevant.
Removed redundant code in DefaultHandlerInvoker.