Fix clobbering of locals during setup