tlbBuilder: adoptions after latest rebase -- most certainly broken...!