Break out argument handlers into independent modules