Tweak protobuf combinators for clarity