Replace OPTIONS[OPT_CIRCLEDIST] with trigdist