Fix cases where goto skips variable initialization found by fixing issue 602
Merge pull request #2918 from yebblies/ddmd602

[DDMD] Issue 602 cleanup