Only include non-empty player names.
Fix the tests to pass (correctly)
Rework the pid assignment and event mapping (again).