diff --git a/src/lib.rs b/src/lib.rs
index 8fddece4902..cae298dbb62 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -262,10 +262,7 @@ impl Shape {
         let alignment = self.offset + extra_width;
         Shape {
             width: self.width,
-            indent: Indent {
-                block_indent: self.indent.block_indent,
-                alignment: alignment,
-            },
+            indent: Indent::new(self.indent.block_indent, alignment),
             offset: alignment,
         }
     }
@@ -274,19 +271,13 @@ impl Shape {
         if self.indent.alignment == 0 {
             Shape {
                 width: self.width,
-                indent: Indent {
-                    block_indent: self.indent.block_indent + extra_width,
-                    alignment: 0,
-                },
+                indent: Indent::new(self.indent.block_indent + extra_width, 0),
                 offset: 0,
             }
         } else {
             Shape {
                 width: self.width,
-                indent: Indent {
-                    block_indent: self.indent.block_indent,
-                    alignment: self.indent.alignment + extra_width,
-                },
+                indent: self.indent + extra_width,
                 offset: self.indent.alignment + extra_width,
             }
         }
@@ -295,10 +286,7 @@ impl Shape {
     pub fn add_offset(&self, extra_width: usize) -> Shape {
         Shape {
             width: self.width,
-            indent: Indent {
-                block_indent: self.indent.block_indent,
-                alignment: self.indent.alignment,
-            },
+            indent: self.indent,
             offset: self.offset + extra_width,
         }
     }
@@ -306,10 +294,7 @@ impl Shape {
     pub fn block(&self) -> Shape {
         Shape {
             width: self.width,
-            indent: Indent {
-                block_indent: self.indent.block_indent,
-                alignment: 0,
-            },
+            indent: self.indent.block_only(),
             offset: self.offset,
         }
     }