please make the list 'flat' if you touch it, we'll gradually convert all of these to a one-per-line style to ease diffing