CLC-2709 Remove some unnecessary stringification