WYCS: minor tweaks
WYCS: working on an abstract notion of lexing.