I think it may be best to separate to a separate commit or PR (to make it easier to review). I feel like hard-coding is worse now that `String` is just a library type, not a language-defined type (as `~str` was), but we can always explore our options here.