Minor cleanup of config generation.