Make cmd line args more consistent