Rearranged a bit, like for the Add ValueNode in r1299. Use type checking for the...