Updates to functions

find_function_calls now fully supports multi-level function calls