Cleanups to RPC code.

This is extracted from a significantly longer RPC change that I put down a couple of weeks ago.

It deletes some unused code, uses Issue and Book a little more, and fixes some long lines and indentation.

Feel free to use this or ignore it!
Hi Tom, yeah, thanks.  I'm now able to follow the transformation from the old code to the new code.  The new code looks like it does the same as the old code but is easier to follow.  I'm good.