This addresses a number of issues with the demo playback system.
See each individual commit for a description.