Migration to parser-combinator, some syntax changes