Also correctly handle the argument types