Fixed a bug with replacing existing expression

A CurrentModificationException is throw when modifying an existing
expression on a cell. Separating the action of iterating through the Map
and removing from the Map fixes it.