macro support is throwing off token ranges