Context leakless refactor.