more tidying-up.

Player no longer has a type parameter.