Avoid variable reassignment

One small commit a day keeps the static analyzers away.