The use of character offsets for JCExpressions in raw diagnostics is clever, and more stable that hashCodes, but it is still somewhat fragile. It would be good to consider changing it to line,offset instead, which tends to be even more stable.