Missing one last utf8_strlen → g_utf8_strlen change
str_rfind() === strrchr(), so drop it now