Get rid of remove conflicts, instead remove actions/holeguids in top-level payload of hole result
Merge ExpressionEdit.Modify into ExpressionEdit.EventMap