Clean up arg handling.