Oh right, I missed that you did it as a separate commit. Makes sense too because with the old way, the buffer wouldn't get cleared if there was nothing to play.