Bit of cleanup to stop protobuf from being stupid.