Refactor syntax format. Prepare for the parser gen.
Writing parser.