True that. This part of the change is not needed. I had something else for a while but ended up with almost identical code after fixing issues. I'll just revert this.