Improve replacement annotations in Particle
Add to sketch of AssignmentStore