Merge AbstractObjectEditor and GenericObjectEditor

This has been a ToDo for ages. Let's get rid of it.