Fixed support for long options.