(Minor, but more significant than the previous case of this) Again, can clearing of this.k2 and this.v be moved to between ExpandScalar() and the if (strstr()s) ?