Now distinguishes between function parameters and class arguments.