Start of simplification of built-in argument classes