Add a micro-pass to fix borrow-checking issues introduced by index_to_function_calls

Add a micro-pass to fix borrow-checking issues introduced by index_to_function_calls #1629