Cleaned up some calls to rpc procedures.