Try to get rid of yielding matches?, one step at a time.