CORE-5216: corectly handle long argument names for flag properties