Some reworking string-handling