Corrected NameError for invalid variable

It looks like `s` got refactored in cd746bf8e5127c6049950ef002c5ca9e1aebed65 but got missed here. It was in one of the super commits so not sure who should review, but simple change.

Heads up to @ichuang