Better (but not great) handling of re-referencing