I took a very quick look and have one other comment:
- components of the specified directories\n\
+ components of the specified directories\n\
This isn't right: those should be leading spaces, without any tabs.
Perhaps you put the source code through a tab normalizer? If so,
please undo all changes of that sort.
It might be better, for a larger change like this, to do the
tab-normalization changes separately anyway, so that we can see the
more-important stuff easily.