Resolve the last two problematic TSI routing key bindings. (dm)