Follow-up to r64903; fix field names broken by r65040.