Make editorData an object no matter what the editor is

This hopefully fixes gh-426