Fix the generated configuration containing uncommented optional sections. Contributed by @Jade