Pretty much. I believe there was an idea behind that obfuscation, but in practice there's no need for it at all, especially because it caused this nasty bug.