Closure shadowing and record fixes