Merge deferred handling of -D option from branch.