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!
Done.  I did clean up some of the tortured logic, so glance at that but it should be pretty obvious.