Use Enumerable#find instead of each where possible

Following up from #175 I found two more places where `.each` is better served by `.find`.