Write variant info later after we've set extra options.

Looks like a bug fix.