Improved handling of move selection for moves with equal opponent moves

Sorry about the diff... we moved to a new package to make it easier to test