Simplify. No functionality changes.