Improve handling of arguments