Added support for non-function arguments to map