Temporary fix: inline the suppress/soft list evaluation.

This works round problems with @vohi's attempts to make variable
expansion less broken; it does so by not exercising what broke in the
course of trying to fix everything else.  We should revert it as soon
as we have a proper fix for that.