task: Rewrite method to make it look less buggy

A for loop that always returns the first element looks suspicious (and
in fact is flagged by SonarQube). We can write this more clearly using
an iterator.

Change-Id: I9d7191dc78deec17b115b304c69339dde04a5e16