Better handling of :random. run-match now works