[FORGE-729] re-adding a named element to a normal annotation should replace rather than accumulate