WyC: still more changes to test cases to ensure that all variables are declared before being used.