You could put a `do` + `end` block around the relevant code to automatically let the variables run out of scope. Diff viewers can ignore whitespace changes.