My patch did not make anything worse, it's just perpetuated the usage of uninitialized variable, which I'd rather avoid. I've pushed another version of this branch, with your patch at the bottom - I hope I did not break any github etiquette by doing that.