Reorganise tableaux functions.