Switch callbacks to take the player's id at call-time, instead of at creation time