P2SH related RPC improvements