Add first heuristics. Improve parser performance.