Fix shadowed flags.
Fix shadowed flags.

ShengjieLuo/pachyderm,sambooo/pachyderm,klucar/pachyderm,klucar/pachyderm,klucar/pachyderm,ShengjieLuo/pachyderm,sambooo/pachyderm,ShengjieLuo/pachyderm,sambooo/pachyderm