Greatly simplify the wrap point computation