Fix some declaration-after-statement gripes in the C.
Revert "Fixed xfail directory in test files"

This reverts commit 20be3789370fa18cbc054190aebb713cbe4c8975.

Conflicts:
	scss/tests/test_files.py
Fix skip/xfail to work with parametrize(), so xfail tests still run.
Unbreak scope-nesting-2 and move it out of xfail.