util: More work with CFG stuff.