Both of these, I believe, assume that the entire album is in the shuffled playlist.

It would, again, be nice if the player remembered playlist information even after the running order is generated.