Minor cleanups in the proto files.