Sorry, mind merging again? I did a dumb thing

Done.

I notice there are errors in Code Style because it doesn't like the _ at the end for classes that are also keywords. Not sure what should be done about that

Not sure what should be done about that

Just remove the underscore. The only reason the underscore exists in PhpParser is because Class is a reserved word. When extending and renaming there's no need to keep that convention.

Done :)

Thanks!