Minor refactoring for combined edit dialog