Adapt to changes in TH syntax