Minor cleanups. No functionality change.