remove slight redundancy
I don't think that one was going anywhere
track selection among alternatives
Fix some bugs introduced by my recent caching improvements