Made some 'binding variables' local (as originally intended)