Minor cleanups in the proto files.

@benlaurie: what's "the I-D"? :-)