Fix some more references to control field bitmasks.