minor code restructuring to aid more state-change dialog-jiggery.
minor code restructuring to aid more state-change dialog-jiggery.

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm