Fix problems with spectators being counted when auto-stripping.