WyC: bug fix for parser and unexpected EOF.