Fix passing locals to extends

Pull Request #545 broke passing locals to `extends`. Specifically commit 2abc390e650ba6bce19a5575d291550e80815bc2. This also adds a test that was failing.