Add call_func, call_one_or_zero, line numbers