Fixup the cfg_extras layout and usage