This patch was originally contributed as a workaround for the cases
where there were flags that took the first argument position.  This fix
was just plain wrong and this commit reverts it.