Item13034: Move JsonRpc switchboard setup

Also some tidy changes that were somehow missed.