Remove more cal-tex code duplication