perf(marshal): Replace more XS-expensive string operations (merge #2005)

perf(marshal): Replace more XS-expensive string operations (merge #2005) #7141