While fixing Trac #12444 I found an occasion on which we applied
worker/wrapper to a DFunId.  This is bad: it destroys the magic
DFunUnfolding.

This patch is a minor refactoring that stops this corner case
happening, and tidies up the code a bit too.