(C3-2157): Use `<-simplified*sources' instead of char-ref in