Better drefcalc parser and /dref/prefix