ProtoBuf usage refactoring.