This should be completed call-by-call as separate diffs (not all at once). I expect it to take some time, especially since a number of RPC calls deserve test coverage where there is currently no need. Include tests where necessary for each call.