Fix handling of getopt variables.