Fix for issue #394, Compound short options and operands are conflated