Rewritten gRPC interface for more consistent future use.