You're right, of course, about a spoiler warning, and I didn't think of it before going to bed or out today. Sorry for that.

I think that in this version Charlie might have stood out a bit better in the factory if he'd made some effort to save any of the other kids from their fate -- being held back by Willie Wonka would be very natural here -- or by recognizing that despite appearances things are set up so the kids can't really be hurt, just turned blue or very thin -- which would also neatly set up his fate in the story.