Code cleanup; ensure no tb in the event of a very-long filename.
Added tag 1.8 for changeset 0badd2757c52