Convert the TSI driver to actually use the new key tables. (dm)