Get rid of dangling elses
Merge pull request #2813 from yebblies/danglingelses

[DDMD] Get rid of dangling elses