Eliminate custom argument validation