Fix handling of long options.