Fix nasty Simplifier scoping bug