Improve argument API usage slightly