Added support for array_map calls and comments