Improve Ada.Strings.Maps for smart linking