Revert "minor: simplify DWrapper"

This reverts commit 1c4a5bc8c41cfac96eb099dd84bb1fa4bdc4e003.