Better handling for partially applied functions #SCL-8005 Fixed