Add ability to do mixed vector/scalar operations with non-constant values.

  v0 = v0 + s1
  v0 = s2 + 12