WyC: making some slow progress through updating test cases for variable declarations.