Fix references to control field masks.