Remove still more cal-tex code duplication