fixup: calls to functions with the right number of arguments