Restructure parser.