Updated patches to use SafeMarkup instead of String.