WYCS: various bug fixes for parsing related to line wrapping and whitespace.