Fix cases where goto skips initialization of variables

Best viewed with `?w=1`