[BUGFIX beta] Remove stripped statement nesting.

Defeatureify cannot handle statement nesting.
Merge pull request #9502 from rwjblue/fix-defeatureify-nesting

[BUGFIX beta] Remove stripped statement nesting.