TSB's can now be sources (cf. Mailing list discussion)

I put the 2nd commit in there as an example. It also means less of Tim's messy code :)