Minor code tidy and bug fix: need to set t = s after first pass and

t and s do not need to have independent values after the first pass
so set t = s.