Fixed issue with destructuring being added to too many methods.
Fixed more issues with the destructuring. I think everything is working again now.