WyCS: fixed up numerous simple problems arising from refactoring; only harder ones left to do.