Remove infinite grammar node, more progress on whitespace graph
Fix whitespace token graph