Uncomment entries that are also in exrc.  Had thought that they were unnecessary and should be single sourced but they are not being picked up.
Demote the visibility of non-text elements: TAB, EOL.