Clean up the comments around the laundry list of configuration, no
real change.