Promote some TH utils to top level