[DDMD] Issue 602 cleanup