Small clean up in protocol.