diff --git a/jedi/inference/arguments.py b/jedi/inference/arguments.py
index 06e3ba8a..aa200fdb 100644
--- a/jedi/inference/arguments.py
+++ b/jedi/inference/arguments.py
@@ -35,7 +35,7 @@ class ParamIssue(Exception):
     pass
 
 
-def repack_with_argument_clinic(string, keep_arguments_param=False, keep_callback_param=False):
+def repack_with_argument_clinic(clinic_string):
     """
     Transforms a function or method with arguments to the signature that is
     given as an argument clinic notation.
@@ -46,35 +46,29 @@ def repack_with_argument_clinic(string, keep_arguments_param=False, keep_callbac
         str.split.__text_signature__
         # Results in: '($self, /, sep=None, maxsplit=-1)'
     """
-    clinic_args = list(_parse_argument_clinic(string))
-
     def decorator(func):
-        def wrapper(context, *args, **kwargs):
-            if keep_arguments_param:
-                arguments = kwargs['arguments']
-            else:
-                arguments = kwargs.pop('arguments')
-            if not keep_arguments_param:
-                kwargs.pop('callback', None)
+        def wrapper(value, arguments):
             try:
-                args += tuple(_iterate_argument_clinic(
-                    context.inference_state,
+                args = tuple(iterate_argument_clinic(
+                    value.inference_state,
                     arguments,
-                    clinic_args
+                    clinic_string,
                 ))
             except ParamIssue:
                 return NO_VALUES
             else:
-                return func(context, *args, **kwargs)
+                return func(value, *args)
 
         return wrapper
     return decorator
 
 
-def _iterate_argument_clinic(inference_state, arguments, parameters):
+def iterate_argument_clinic(inference_state, arguments, clinic_string):
     """Uses a list with argument clinic information (see PEP 436)."""
+    clinic_args = list(_parse_argument_clinic(clinic_string))
+
     iterator = PushBackIterator(arguments.unpack())
-    for i, (name, optional, allow_kwargs, stars) in enumerate(parameters):
+    for i, (name, optional, allow_kwargs, stars) in enumerate(clinic_args):
         if stars == 1:
             lazy_values = []
             for key, argument in iterator:
@@ -94,7 +88,7 @@ def _iterate_argument_clinic(inference_state, arguments, parameters):
             raise ParamIssue
         if argument is None and not optional:
             debug.warning('TypeError: %s expected at least %s arguments, got %s',
-                          name, len(parameters), i)
+                          name, len(clinic_args), i)
             raise ParamIssue
 
         value_set = NO_VALUES if argument is None else argument.infer()
diff --git a/jedi/plugins/stdlib.py b/jedi/plugins/stdlib.py
index 64c61f5f..be6a2eae 100644
--- a/jedi/plugins/stdlib.py
+++ b/jedi/plugins/stdlib.py
@@ -16,7 +16,7 @@ from jedi._compatibility import force_unicode, Parameter
 from jedi import debug
 from jedi.inference.utils import safe_property
 from jedi.inference.helpers import get_str_or_none
-from jedi.inference.arguments import \
+from jedi.inference.arguments import iterate_argument_clinic, ParamIssue, \
     repack_with_argument_clinic, AbstractArguments, TreeArgumentsWrapper
 from jedi.inference import analysis
 from jedi.inference import compiled
@@ -143,7 +143,7 @@ def _follow_param(inference_state, arguments, index):
         return lazy_value.infer()
 
 
-def argument_clinic(string, want_value=False, want_context=False,
+def argument_clinic(clinic_string, want_value=False, want_context=False,
                     want_arguments=False, want_inference_state=False,
                     want_callback=False):
     """
@@ -151,13 +151,15 @@ def argument_clinic(string, want_value=False, want_context=False,
     """
 
     def f(func):
-        @repack_with_argument_clinic(string, keep_arguments_param=True,
-                                     keep_callback_param=True)
-        def wrapper(value, *args, **kwargs):
-            arguments = kwargs.pop('arguments')
-            callback = kwargs.pop('callback')
-            assert not kwargs  # Python 2...
+        def wrapper(value, arguments, callback):
+            try:
+                args = tuple(iterate_argument_clinic(
+                    value.inference_state, arguments, clinic_string))
+            except ParamIssue:
+                return NO_VALUES
+
             debug.dbg('builtin start %s' % value, color='MAGENTA')
+            kwargs = {}
             if want_context:
                 kwargs['context'] = arguments.context
             if want_value:
diff --git a/test/completion/stdlib.py b/test/completion/stdlib.py
index 306aea11..7dcc6c37 100644
--- a/test/completion/stdlib.py
+++ b/test/completion/stdlib.py
@@ -171,6 +171,9 @@ def example(a):
 #? str()
 example('')
 
+# From GH #1574
+#? float()
+functools.wraps(functools.partial(str, 1))(lambda: 1.0)()
 
 # -----------------
 # sqlite3 (#84)