Remove yet more cal-tex code duplication