Subzero: Clean up function header emission.

tests_lit/llvm2ice_tests/callindirect.pnacl.ll

 ; Test of multiple indirect calls to the same target.  Each call
 ; should be to the same operand, whether it's in a register or on the
 ; stack.
 
-; RUN: %p2i --assemble --disassemble -i %s --args -O2 --verbose none \
+; RUN: %p2i --filetype=obj --disassemble -i %s --args -O2 \
 ; RUN:   | FileCheck %s
-; RUN: %p2i --assemble --disassemble -i %s --args -Om1 --verbose none \
+; RUN: %p2i --filetype=obj --disassemble -i %s --args -Om1 \
 ; RUN:   | FileCheck --check-prefix=OPTM1 %s
 
 @__init_array_start = internal constant [0 x i8] zeroinitializer, align 4
 @__fini_array_start = internal constant [0 x i8] zeroinitializer, align 4
 @__tls_template_start = internal constant [0 x i8] zeroinitializer, align 8
 @__tls_template_alignment = internal constant [4 x i8] c"\01\00\00\00", align 4
 
 define internal void @CallIndirect(i32 %f) {
 entry:
   %__1 = inttoptr i32 %f to void ()*
@@ skipping 48 matching lines @@
 ; define internal void @CallIndirectConst() {
 ; entry:
 ;   %__1 = inttoptr i32 66496 to void ()*
 ;   call void %__1()
 ;   call void %__1()
 ;   call void %__1()
 ;   call void %__1()
 ;   call void %__1()
 ;   ret void
 ; }