Restructured player definitions slightly.