Fix cases where goto skips initialization of variables
Remove uses of NCEG operators
Merge pull request #666 from yebblies/nceg

Remove uses of NCEG operators
Merge pull request #665 from yebblies/gotoskipinit

Fix cases where goto skips initialization of variables