Merge "Factor out shared variant options from config when writing." into main