Minor config cleanup (added missing lines, re-alphabetized).