Simplify a bit. No functionality change.