Correct users of for-each-ref