Moving more global state into list-specific state, to avoid clobbering.