Small cleanup for protocol specification