@jreback is this branch used anywhere? Maybe it's caught earlier?  There's no test case for it. (because otherwise it would raise a NameError)