WYCS: minor tweak to parsing
WYCS: bug fix for new syntax.
WYCS: making progress on refactoring various aspects of the syntax and internal AST structure.