Refactorings in wizard components

This is a follow-up to the changes in #625.