Fix inconsistency between handler's parameter types and what is actually passed to rpc call. Also get rid of unneeded local variables. Reviewed-by: Asias He <asias@cloudius-systems.com>