Switch to the generic RpcServer, closes #259.

Done