Make some improvements to how SORT_* specifiers and EXCLUDE_FILE specifiers are handl...