Revert "Revert "Deponent Tweaks""

This reverts commit 66cd6e4bc13036fbcbe0998312961396cc7ea67b.