Ensure we do not mutate options anywhere in driver