Yes, I would also rather see this used first in the player, instead of having two different implementations that we later have to reconcile. The latter is more error prone, more work, and, worse, likely not to happen at all.