Rewritten wrapper to not dup strings.