Fixes #284

Also re-enables some scene variations that were being missed. Presumably some of the logic handling how this works was changed at some point, and very subtly broke the scene content.