use shorter names (code-map-substrings), also map strings