Added a workaround for the problem of reserved words (e.g. 'class') as keyword arguments.