Made changes for -D

But I made them in a separate file, as I remember you had already
started and did not want to run into a merge conflict. I also replaced
all new tabs with 4 spaces.