Move some extensions into EmbedBuilder [2]

Apparently git didn't like that previous commit

src/Discord.Net.Rest/Entities/Messages/EmbedBuilder.cs

@@ -79,6 +79,17 @@ namespace Discord
             Author = author;
             return this;
         }
+        public EmbedBuilder WithAuthor(string name, string iconUrl = null, string url = null)
+        {
+            var author = new EmbedAuthorBuilder
+            {
+                Name = name,
+                IconUrl = iconUrl,
+                Url = url
+            };
+            Author = author;
+            return this;
+        }
         public EmbedBuilder WithFooter(EmbedFooterBuilder footer)
         {
             Footer = footer;
@@ -91,6 +102,16 @@ namespace Discord
             Footer = footer;
             return this;
         }
+        public EmbedBuilder WithFooter(string text, string iconUrl = null)
+        {
+            var footer = new EmbedFooterBuilder
+            {
+                Text = text,
+                IconUrl = iconUrl
+            };
+            Footer = footer;
+            return this;
+        }
 
         public EmbedBuilder AddField(EmbedFieldBuilder field)
         {
@@ -104,6 +125,17 @@ namespace Discord
             _fields.Add(field);
             return this;
         }
+        public EmbedBuilder AddField(string title, string text, bool inline = false)
+        {
+            var field = new EmbedFieldBuilder
+            {
+                Name = title,
+                Value = text,
+                IsInline = inline
+            };
+            _fields.Add(field);
+            return this;
+        }
 
         public Embed Build()
         {

src/Discord.Net.Rest/Extensions/EmbedBuilderExtensions.cs

@@ -2,21 +2,6 @@ namespace Discord
 {
     public static class EmbedBuilderExtensions
     {
-        public static EmbedBuilder AddField(this EmbedBuilder builder, string title, string text, bool inline = false) =>
-            builder.AddField(field =>
-            {
-                field.Name = title;
-                field.Value = text;
-                field.IsInline = inline;
-            });
-
-        public static EmbedBuilder WithFooter(this EmbedBuilder builder, string text, string iconUrl = null) =>
-            builder.WithFooter(footer =>
-            {
-                footer.Text = text;
-                footer.IconUrl = iconUrl;
-            });
-
         public static EmbedBuilder WithColor(this EmbedBuilder builder, uint rawValue) =>
             builder.WithColor(new Color(rawValue));
 
@@ -26,14 +11,6 @@ namespace Discord
         public static EmbedBuilder WithColor(this EmbedBuilder builder, float r, float g, float b) =>
             builder.WithColor(new Color(r, g, b));
 
-        public static EmbedBuilder WithAuthor(this EmbedBuilder builder, string name, string iconUrl = null, string url = null) =>
-            builder.WithAuthor(author =>
-            {
-                author.Name = name;
-                author.IconUrl = iconUrl;
-                author.Url = url;
-            });
-
         public static EmbedBuilder WithAuthor(this EmbedBuilder builder, IUser user) =>
             WithAuthor(builder, $"{user.Username}#{user.Discriminator}", user.AvatarUrl);