Cosmetic changes to config code.