message: No more ad hoc arg distinctions
diff: @@ -4,7 +4,7 @@ import json
  import sys
  from collections import namedtuple
  -from form_blocks import form_blocks, TERMINATORS
  +from form_blocks import form_blocks
  from util import flatten, var_args
  # A Value uniquely represents a computation in terms of sub-values.
  @@ -172,11 +172,7 @@ def lvn_block(block, lookup, canonicalize, fold):
  # Update argument variable names to canonical variables.
  if 'args' in instr:
  - new_args = [num2var[n] for n in argnums]
  - if instr['op'] not in TERMINATORS:
  - instr['args'] = new_args
  - elif instr['op'] == 'br':
  - instr['args'] += instr['args'][1:] + new_args
  + instr['args'] = [num2var[n] for n in argnums]
  def _lookup(value2num, value):
  