Some clean-up from my player picking fix.