Fix: the forward walker was ignoring unexpanded loops