diff --git a/src/ast/printer/mod.rs b/src/ast/printer/mod.rs
index 9451da2..62c4f25 100644
--- a/src/ast/printer/mod.rs
+++ b/src/ast/printer/mod.rs
@@ -29,6 +29,8 @@ where
     pub err: Option<std::io::Error>,
 }
 
+// TODO(jwall): At some point we probably want to be more aware of line length
+// in our formatting. But not at the moment.
 impl<W> AstPrinter<W>
 where
     W: Write,
@@ -107,14 +109,12 @@ where
     fn render_list_def(&mut self, def: &ListDef) -> std::io::Result<()> {
         write!(self.w, "[")?;
         self.curr_indent += self.indent;
-        // If the element list is just 1 we might be able to collapse the tuple.
         let indent = self.make_indent();
         let has_fields = def.elems.len() > 0;
         if has_fields {
             write!(self.w, "\n")?;
         }
         for e in def.elems.iter() {
-            // TODO(jwall): Now print out the elements
             write!(self.w, "{}", indent)?;
             self.render_expr(e)?;
             write!(self.w, ",\n")?;
@@ -216,13 +216,24 @@ where
                 self.w.write("(".as_bytes())?;
                 self.curr_indent += self.indent;
                 let indent = self.make_indent();
+                let has_args = _def.arglist.len() > 1;
+                if has_args {
+                    write!(self.w, "\n")?;
+                }
                 for e in _def.arglist.iter() {
-                    self.w.write(indent.as_bytes())?;
+                    if has_args {
+                        write!(self.w, "{}", indent)?;
+                    }
                     self.render_expr(e)?;
-                    self.w.write("\n".as_bytes())?;
+                    if has_args {
+                        self.w.write(",\n".as_bytes())?;
+                    }
                 }
                 self.curr_indent -= self.indent;
-                self.w.write("(".as_bytes())?;
+                if has_args {
+                    write!(self.w, "{}", self.make_indent())?;
+                }
+                self.w.write(")".as_bytes())?;
             }
             Expression::Copy(_def) => {
                 self.render_value(&_def.selector)?;
diff --git a/src/ast/printer/test.rs b/src/ast/printer/test.rs
index b9a7896..527e0e4 100644
--- a/src/ast/printer/test.rs
+++ b/src/ast/printer/test.rs
@@ -23,7 +23,18 @@ fn assert_parse(input: &str) -> Vec<Statement> {
 #[test]
 fn test_simple_value_printing() {
     let input = "1;";
-    let stmts = assert_parse("1;");
+    let stmts = assert_parse(input);
+    let mut buffer: Vec<u8> = Vec::new();
+    let mut printer = AstPrinter::new(0, &mut buffer);
+    printer.render(&stmts);
+    assert!(printer.err.is_none());
+    assert_eq!(String::from_utf8(buffer).unwrap(), format!("{}\n", input));
+}
+
+#[test]
+fn test_simple_selector_printing() {
+    let input = "foo.bar.quux;";
+    let stmts = assert_parse(input);
     let mut buffer: Vec<u8> = Vec::new();
     let mut printer = AstPrinter::new(0, &mut buffer);
     printer.render(&stmts);
@@ -165,3 +176,47 @@ fn test_let_statement_printing() {
     assert!(printer.err.is_none());
     assert_eq!(String::from_utf8(buffer).unwrap(), format!("{}\n", input));
 }
+
+#[test]
+fn test_call_expr_printing() {
+    let input = "call(\n  foo,\n  bar,\n);";
+    let stmts = assert_parse(input);
+    let mut buffer: Vec<u8> = Vec::new();
+    let mut printer = AstPrinter::new(2, &mut buffer);
+    printer.render(&stmts);
+    assert!(printer.err.is_none());
+    assert_eq!(String::from_utf8(buffer).unwrap(), format!("{}\n", input));
+}
+
+#[test]
+fn test_call_expr_one_arg_printing() {
+    let input = "call(foo);";
+    let stmts = assert_parse(input);
+    let mut buffer: Vec<u8> = Vec::new();
+    let mut printer = AstPrinter::new(2, &mut buffer);
+    printer.render(&stmts);
+    assert!(printer.err.is_none());
+    assert_eq!(String::from_utf8(buffer).unwrap(), format!("{}\n", input));
+}
+
+#[test]
+fn test_copy_expr_printing() {
+    let input = "copy{\n  foo = 1,\n  bar = 2,\n};";
+    let stmts = assert_parse(input);
+    let mut buffer: Vec<u8> = Vec::new();
+    let mut printer = AstPrinter::new(2, &mut buffer);
+    printer.render(&stmts);
+    assert!(printer.err.is_none());
+    assert_eq!(String::from_utf8(buffer).unwrap(), format!("{}\n", input));
+}
+
+#[test]
+fn test_copy_expr_one_arg_printing() {
+    let input = "copy{\n  foo = 1,\n};";
+    let stmts = assert_parse(input);
+    let mut buffer: Vec<u8> = Vec::new();
+    let mut printer = AstPrinter::new(2, &mut buffer);
+    printer.render(&stmts);
+    assert!(printer.err.is_none());
+    assert_eq!(String::from_utf8(buffer).unwrap(), format!("{}\n", input));
+}