Remove PlayerIndex references, as PlayerIndex.One is always assumed.