wizard-source: Minor refactor