Some tweaks to print_func_entry()