WIP SI-6476 Support proposed s"$"" escape