Fix C code mapper invocations

loopy/codegen/instruction.py

@@ -176,7 +176,7 @@ def generate_c_instruction_code(kernel, insn, codegen_state):
                 Initializer(
                     POD(kernel.index_dtype, name),
                     codegen_state.c_code_mapper(
-                        iname_expr, prec=None, type_context="i")))
+                        iname_expr, prec=PREC_NONE, type_context="i")))
 
     if body:
         body.append(Line())

loopy/preprocess.py

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 
 import six
-from six.moves import range, zip
+from six.moves import range
 import numpy as np
 import pyopencl as cl
 import pyopencl.characterize as cl_char
@@ -471,7 +471,7 @@ def realize_reduction(kernel, insn_id_filter=None):
             insn = insn.copy(
                         expression=new_expression,
                         insn_deps=insn.insn_deps
-                            | frozenset(new_insn_insn_deps),
+                        | frozenset(new_insn_insn_deps),
                         forced_iname_deps=temp_kernel.insn_inames(insn))
 
             insn_queue = generated_insns + [insn] + insn_queue