Missed some handling of loops last time.