Adapted to changes of MessageField since the values changed there.