Proper support for long options