Fix problem with nested control field defaults (#3163)