Extend hierarchical unrolling for function calls