fix editor deactivation issues

the active cell can change while the deferreds process, so ensure changes
are applied to the correct cell and the editor locks don't get crossed up