Restructured parser and internal representation.