Nuke the modules, add rework-vars.