I keep track of the original shared variables, plus remove the distinction
between outer and inner since is not needed anymore.