ConfigGen: Mostly just cosmetic changes