Revised fix for the SUBDIR_TOKEN bug reported by Daniel Weber,
initially "fixed" by changelist 4397. This fix is from Chris
Seiwald, who notes that _tokens was originally not intended to
have been modified when stripping common elements. In this
version, local copies of _tokens and SUBDIR_DOWN are modified
instead.