Simplify. No functionality change.