Implemented to some extent the proper parsing of function calls