Cleaned up argument handling.