Correct merged code with our current implementation of toggles.