Refactor TLI creation. NFC.