Bug 1092737 followup, because ScalarValueString got renamed.