> P.S. If you develop your changes on top of my 'remove_long_u' branch, we won't have merge problems once this PR is merged.

@elmart then I need you to reimplement these using `xstrdup`.