Removed the module-global `that` variable