fix(*): reintegrate new features from rebase
style(*): clean up whitespace, unused params, etc.
chore(test): don't dump deferrers on digest cycle