More work on wizard transitions.