This should fix the failures in the conformance tests - although
it highlights the problem that we need to do this when changing
the conformance.proto file...