Correct description; update to Wizard Parser.
Merge branch 'master' into 'to-ansi-c'.