wizard: simplify control flow

Checking if a byte is 0 before checking it for something else doesn't do
anything useful. Also one can be sure that it can't be anything wanted
if the value was set to 0 immediately before.
Merge topic 'wizard-cleanup' into next

eca523f wizard: simplify control flow