use the tokeniser to make dump() expression extraction more reliable