bug 1221: Move calc_points() up to the other point calculation functions