Fix cases where goto skips initialization of variables
Merge pull request #665 from yebblies/gotoskipinit

Fix cases where goto skips initialization of variables