Remove some more %D remains here and there.