Ungroup to make future tlds.h patches smaller