Refactor for stealth changes.