vet: Use keyed fields