Could we leave this formatting change out of this PR? It's going to be replaced with entirely different code once PR#325 lands (separate event handlers for adds, removes, and changes).