Any flags that we are explicitly adding should not end up going through the arg filtering. I see that you changed this, but I don't think that's a good idea.