Switch to Guava 14, and keep track of recently aborted matches so they
can be ignored when encountered during updates / move selections.