Simplify code. No functionality change.