Parser's design scheme commented, YAGNI code removed.