Cleanup marcos for arg

There are two patches. The one is obvious.
The another is not a bug fix but for symmetry and/or readability.