Handle more combinations of Editor data. Test everything.