Fix double-resolve issue (in {% for %} loops)