Bug 1005921 - Clean up the CallsHandler and HandledCall code as well as the relevant tests