Fix #23 other part.

Simplifying the parsing algorithm.