Add TBone v0.3 compatibility.  Remove some convoluted name-guessing logic.