Make tab generator signatures uniform