Revert "bug fix"

This reverts commit de1dfcbb54bddda8faadae5f18a65823a83b30ba.
Revert "less noisy singletonizeDClosures()"

This reverts commit 9f1477a4fe8c129c7014758fb07fd2c500de0eb1.