Changes to match NQP qast_refactor branch.
Merge branch 'qast_refactor' into nom