refactor make_target_call
support 2 call sigs for a function
fix off-by-one error in emitting call