More work on spectator mode.