Simplify code a bit. No functionality change.