Refactored dialog listeners.