diff --git a/src/ddmd/idgen.d b/src/ddmd/idgen.d
index 826f21a8117f..2ec2aa47f349 100644
--- a/src/ddmd/idgen.d
+++ b/src/ddmd/idgen.d
@@ -88,6 +88,7 @@ Msgtable[] msgtable =
     { "cpp_type_info_ptr", "__cpp_type_info_ptr" },
     { "_assert", "assert" },
     { "_unittest", "unittest" },
+    { "_body", "body" },
 
     { "TypeInfo" },
     { "TypeInfo_Class" },
diff --git a/src/ddmd/parse.d b/src/ddmd/parse.d
index f8b000c16787..b9961f79aab3 100644
--- a/src/ddmd/parse.d
+++ b/src/ddmd/parse.d
@@ -780,7 +780,10 @@ final class Parser(AST) : Lexer
 
                 /* Look for return type inference for template functions.
                  */
-                if (token.value == TOKidentifier && skipParens(peek(&token), &tk) && skipAttributes(tk, &tk) && (tk.value == TOKlparen || tk.value == TOKlcurly || tk.value == TOKin || tk.value == TOKout || tk.value == TOKbody))
+                if (token.value == TOKidentifier && skipParens(peek(&token), &tk) && skipAttributes(tk, &tk) &&
+                    (tk.value == TOKlparen || tk.value == TOKlcurly || tk.value == TOKin ||
+                     tk.value == TOKout || tk.value == TOKdo ||
+                     tk.value == TOKidentifier && tk.ident == Id._body))
                 {
                     a = parseDeclarations(true, pAttrs, pAttrs.comment);
                     if (a && a.dim)
@@ -4303,7 +4306,10 @@ final class Parser(AST) : Lexer
 
         /* Look for return type inference for template functions.
          */
-        if ((storage_class || udas) && token.value == TOKidentifier && skipParens(peek(&token), &tk) && skipAttributes(tk, &tk) && (tk.value == TOKlparen || tk.value == TOKlcurly || tk.value == TOKin || tk.value == TOKout || tk.value == TOKbody))
+        if ((storage_class || udas) && token.value == TOKidentifier && skipParens(peek(&token), &tk) &&
+            skipAttributes(tk, &tk) &&
+            (tk.value == TOKlparen || tk.value == TOKlcurly || tk.value == TOKin || tk.value == TOKout ||
+             tk.value == TOKdo || tk.value == TOKidentifier && tk.ident == Id._body))
         {
             ts = null;
         }
@@ -4662,7 +4668,12 @@ final class Parser(AST) : Lexer
             f.endloc = endloc;
             break;
 
-        case TOKbody:
+        case TOKidentifier:
+            if (token.ident == Id._body)
+                goto case TOKdo;
+            goto default;
+
+        case TOKdo:
             nextToken();
             f.fbody = parseStatement(PScurly);
             f.endloc = endloc;
@@ -6609,7 +6620,7 @@ final class Parser(AST) : Lexer
             case TOKlcurly:
             case TOKin:
             case TOKout:
-            case TOKbody:
+            case TOKdo:
                 // The !parens is to disallow unnecessary parentheses
                 if (!parens && (endtok == TOKreserved || endtok == t.value))
                 {
@@ -6618,6 +6629,11 @@ final class Parser(AST) : Lexer
                 }
                 return false;
 
+            case TOKidentifier:
+                if (t.ident == Id._body)
+                    goto case TOKdo;
+                goto default;
+
             case TOKif:
                 return haveTpl ? true : false;
 
@@ -6625,6 +6641,7 @@ final class Parser(AST) : Lexer
                 return false;
             }
         }
+        assert(0);
     }
 
     bool isParameters(Token** pt)
diff --git a/src/ddmd/tokens.d b/src/ddmd/tokens.d
index 6ab3ecab9d9c..e5852c61a84e 100644
--- a/src/ddmd/tokens.d
+++ b/src/ddmd/tokens.d
@@ -267,7 +267,6 @@ enum TOK : int
 
     // 213
     // Contracts
-    TOKbody,
     TOKinvariant,
 
     // Testing
@@ -520,7 +519,6 @@ alias TOKscope = TOK.TOKscope;
 alias TOKon_scope_exit = TOK.TOKon_scope_exit;
 alias TOKon_scope_failure = TOK.TOKon_scope_failure;
 alias TOKon_scope_success = TOK.TOKon_scope_success;
-alias TOKbody = TOK.TOKbody;
 alias TOKinvariant = TOK.TOKinvariant;
 alias TOKunittest = TOK.TOKunittest;
 alias TOKargTypes = TOK.TOKargTypes;
@@ -674,7 +672,6 @@ extern (C++) struct Token
         TOKprotected: "protected",
         TOKpublic: "public",
         TOKexport: "export",
-        TOKbody: "body",
         TOKinvariant: "invariant",
         TOKunittest: "unittest",
         TOKversion: "version",
@@ -1167,7 +1164,6 @@ private immutable TOK[] keywords =
     TOKprotected,
     TOKpublic,
     TOKexport,
-    TOKbody,
     TOKinvariant,
     TOKunittest,
     TOKversion,
diff --git a/test/fail_compilation/failcontracts.d b/test/fail_compilation/failcontracts.d
new file mode 100644
index 000000000000..1932325bd15c
--- /dev/null
+++ b/test/fail_compilation/failcontracts.d
@@ -0,0 +1,24 @@
+/* TEST_OUTPUT:
+---
+fail_compilation/failcontracts.d(18): Error: missing { ... } for function literal
+fail_compilation/failcontracts.d(18): Error: semicolon expected following auto declaration, not 'bode'
+fail_compilation/failcontracts.d(19): Error: function declaration without return type. (Note that constructors are always named 'this')
+fail_compilation/failcontracts.d(19): Error: no identifier for declarator test1()
+fail_compilation/failcontracts.d(19): Error: semicolon expected following function declaration
+fail_compilation/failcontracts.d(20): Error: semicolon expected following function declaration
+fail_compilation/failcontracts.d(22): Error: unexpected ( in declarator
+fail_compilation/failcontracts.d(22): Error: found 'T' when expecting ')'
+fail_compilation/failcontracts.d(22): Error: enum declaration is invalid
+fail_compilation/failcontracts.d(22): Error: found ')' instead of statement
+---
+*/
+
+void test()
+{
+    auto f1 = function() bode;
+    auto test1() bode;
+    auto test2()() bode;
+
+    enum : int (int function() bode T);
+}
+
diff --git a/test/runnable/testcontracts.d b/test/runnable/testcontracts.d
index 119fec8b1749..9a2639d1afb1 100644
--- a/test/runnable/testcontracts.d
+++ b/test/runnable/testcontracts.d
@@ -21,7 +21,7 @@ class A
         assert(result & 1);
         assert(x == 7);
     }
-    body
+    do
     {
         return i;
     }
@@ -43,7 +43,7 @@ class B : A
         assert(result < 8);
         assert(x == 7);
     }
-    body
+    do
     {
         return i - 1;
     }
@@ -75,7 +75,7 @@ class A2
         assert(result & 1);
         assert(x == 7);
     }
-    body
+    do
     {
         return i;
     }
@@ -97,7 +97,7 @@ class B2 : A2
         assert(result < 8);
         assert(x == 7);
     }
-    body
+    do
     {
         return i - 1;
     }
@@ -119,7 +119,7 @@ class C : B2
         assert(result == 1 || result == 3 || result == 5);
         assert(x == 7);
     }
-    body
+    do
     {
         return i - 1;
     }
@@ -139,7 +139,7 @@ void fun(int x)
 in {
     if (x < 0) throw new Exception("a");
 }
-body {
+do {
 }
 
 void test3()
@@ -161,7 +161,7 @@ interface Stack {
 class CC : Stack
 {
     int pop()
-    //out (result) { printf("CC.pop.out\n"); } body
+    //out (result) { printf("CC.pop.out\n"); } do
     {
         printf("CC.pop.in\n");
         return 3;
@@ -181,7 +181,7 @@ out(result)
 {
     assert(result == 500);
 }
-body
+do
 {
     return n * 100;
 }
@@ -208,7 +208,7 @@ out(r)
     // Regression check of issue 3390
     static assert(!__traits(compiles, r = 1));
 }
-body
+do
 {
     static int dummy;
     return dummy;
@@ -231,7 +231,7 @@ class Bug3722A
 }
 class Bug3722B : Bug3722A
 {
-    override void fun() in { assert(false); } body {}
+    override void fun() in { assert(false); } do {}
 }
 
 void test6()
@@ -246,7 +246,7 @@ void test6()
 auto test7foo()
 in{
     ++cnt;
-}body{
+}do{
     ++cnt;
     return "str";
 }
@@ -264,7 +264,7 @@ auto foo8()
 out(r){
     ++cnt;
     assert(r == 10);
-}body{
+}do{
     ++cnt;
     return 10;
 }
@@ -272,7 +272,7 @@ out(r){
 auto bar8()
 out{
     ++cnt;
-}body{
+}do{
     ++cnt;
 }
 
@@ -292,6 +292,18 @@ void test8()
 
 void test9()
 {
+  {
+    auto f1 = function() do { }; // fine
+    auto f2 = function() in { } do { }; // fine
+    auto f3 = function() out { } do { }; // error
+    auto f4 = function() in { } out { } do { }; // error
+
+    auto d1 = delegate() do { }; // fine
+    auto d2 = delegate() in { } do { }; // fine
+    auto d3 = delegate() out { } do { }; // error
+    auto d4 = delegate() in { } out { } do { }; // error
+  }
+  {
     auto f1 = function() body { }; // fine
     auto f2 = function() in { } body { }; // fine
     auto f3 = function() out { } body { }; // error
@@ -301,6 +313,25 @@ void test9()
     auto d2 = delegate() in { } body { }; // fine
     auto d3 = delegate() out { } body { }; // error
     auto d4 = delegate() in { } out { } body { }; // error
+  }
+}
+
+/*******************************************/
+
+auto test10() body { return 3; }
+auto test11()() body { return 3; }
+
+auto test12()
+{
+    auto test10() body { return 3; }
+    auto test11()() body { return 3; }
+    return 3;
+}
+
+
+void test13()
+{
+    int function() fp13;
 }
 
 /*******************************************/
@@ -316,7 +347,7 @@ in{
 out(r){
     assert(r == 10);
     ++cnt;
-}body{
+}do{
     ++cnt;
     int r = 10;
     return r;
@@ -382,7 +413,7 @@ class Bug6417
         };
         dg();
     }
-    body {}
+    do {}
 }
 
 void test6417()
@@ -395,10 +426,18 @@ void test6417()
 
 void test7218()
 {
-    size_t foo()  in{}  out{}  body{ return 0; } // OK
-    size_t bar()  in{}/*out{}*/body{ return 0; } // OK
-    size_t hoo()/*in{}*/out{}  body{ return 0; } // NG1
-    size_t baz()/*in{}  out{}*/body{ return 0; } // NG2
+  {
+    size_t foo()  in{}  out{}  do{ return 0; } // OK
+    size_t bar()  in{}/*out{}*/do{ return 0; } // OK
+    size_t hoo()/*in{}*/out{}  do{ return 0; } // NG1
+    size_t baz()/*in{}  out{}*/do{ return 0; } // NG2
+  }
+  {
+    size_t goo()  in{}  out{}  body{ return 0; } // OK
+    size_t gar()  in{}/*out{}*/body{ return 0; } // OK
+    size_t gob()/*in{}*/out{}  body{ return 0; } // NG1
+    size_t gaz()/*in{}  out{}*/body{ return 0; } // NG2
+  }
 }
 
 /*******************************************/
@@ -449,7 +488,7 @@ void test7517()
 
         void setEnable()
         in {}       // supply in-contract to invoke I.setEnable.in
-        body
+        do
         {
             assert(self is this);
             result ~= "C.setEnable/";
@@ -492,11 +531,11 @@ class P7699
 {
     void f(int n) in {
         assert (n);
-    } body { }
+    } do { }
 }
 class D7699 : P7699
 {
-    override void f(int n) in { } body { }
+    override void f(int n) in { } do { }
 }
 
 /*******************************************/
@@ -507,20 +546,20 @@ class AA7883
 {
     int foo()
     out (r1) { }
-    body { return 1; }
+    do { return 1; }
 }
 
 class BA7883 : AA7883
 {
     override int foo()
     out (r2) { }
-    body { return 1; }
+    do { return 1; }
 }
 
 class CA7883 : BA7883
 {
     override int foo()
-    body { return 1; }
+    do { return 1; }
 }
 
 // Error: undefined identifier r2, did you mean variable r3?
@@ -528,14 +567,14 @@ class AB7883
 {
     int foo()
     out (r1) { }
-    body { return 1; }
+    do { return 1; }
 }
 
 class BB7883 : AB7883
 {
     override int foo()
     out (r2) { }
-    body { return 1; }
+    do { return 1; }
 
 }
 
@@ -543,7 +582,7 @@ class CB7883 : BB7883
 {
     override int foo()
     out (r3) { }
-    body { return 1; }
+    do { return 1; }
 }
 
 // Error: undefined identifier r3, did you mean variable r4?
@@ -551,28 +590,28 @@ class AC7883
 {
     int foo()
     out (r1) { }
-    body { return 1; }
+    do { return 1; }
 }
 
 class BC7883 : AC7883
 {
     override int foo()
     out (r2) { }
-    body { return 1; }
+    do { return 1; }
 }
 
 class CC7883 : BC7883
 {
     override int foo()
     out (r3) { }
-    body { return 1; }
+    do { return 1; }
 }
 
 class DC7883 : CC7883
 {
     override int foo()
     out (r4) { }
-    body { return 1; }
+    do { return 1; }
 }
 
 /*******************************************/
@@ -586,7 +625,7 @@ struct S7892
 
 S7892 f7892()
 out (result) {}     // case 1
-body
+do
 {
     return S7892(1);
 }
@@ -631,7 +670,7 @@ class Bug8073
 {
     static int test;
     int foo()
-    out(r) { test = 7; } body
+    out(r) { test = 7; } do
     {
         Container8073 ww;
         foreach( xxx ; ww ) {  }
@@ -639,7 +678,7 @@ class Bug8073
     }
 
     ref int bar()
-    out { } body
+    out { } do
     {
         Container8073 ww;
         foreach( xxx ; ww ) {  }
@@ -666,7 +705,7 @@ void test8093()
     static int g = 10;
     static int* p;
 
-    enum fbody = q{
+    enum fdo = q{
         static struct S {
             int opApply(scope int delegate(ref int) dg) { return dg(g); }
         }
@@ -677,19 +716,19 @@ void test8093()
     };
 
     ref int foo_ref1() out(r) { assert(&r is &g && r == 10); }
-    body { mixin(fbody); }
+    do { mixin(fdo); }
 
     ref int foo_ref2()
-    body { mixin(fbody); }
+    do { mixin(fdo); }
 
     { auto q = &foo_ref1(); assert(q is &g && *q == 10); }
     { auto q = &foo_ref2(); assert(q is &g && *q == 10); }
 
     int foo_val1() out(r) { assert(&r !is &g && r == 10); }
-    body { mixin(fbody); }
+    do { mixin(fdo); }
 
     int foo_val2()
-    body { mixin(fbody); }
+    do { mixin(fdo); }
 
     { auto n = foo_val1(); assert(&n !is &g && n == 10); }
     { auto n = foo_val2(); assert(&n !is &g && n == 10); }
@@ -706,22 +745,22 @@ class A9383
     void failInBase() { assert(typeid(this) is typeid(A9383)); }
 
     // in-contract tests
-    void foo1(int i) in  { A9383.val = i; failInBase; } body { }                        // no closure
-    void foo2(int i) in  { A9383.val = i; failInBase; } body { int x; dg = { ++x; }; }  // closure [local]
-    void foo3(int i) in  { A9383.val = i; failInBase; } body {        dg = { ++i; }; }  // closure [parameter]
-    void foo4(int i) in  { A9383.val = i; failInBase; } body { }                        // no closure
-    void foo5(int i) in  { A9383.val = i; failInBase; } body { }                        // no closure
-    void foo6(int i) in  { A9383.val = i; failInBase; } body { int x; dg = { ++x; }; }  // closure [local]
-    void foo7(int i) in  { A9383.val = i; failInBase; } body {        dg = { ++i; }; }  // closure [parameter]
+    void foo1(int i) in  { A9383.val = i; failInBase; } do { }                        // no closure
+    void foo2(int i) in  { A9383.val = i; failInBase; } do { int x; dg = { ++x; }; }  // closure [local]
+    void foo3(int i) in  { A9383.val = i; failInBase; } do {        dg = { ++i; }; }  // closure [parameter]
+    void foo4(int i) in  { A9383.val = i; failInBase; } do { }                        // no closure
+    void foo5(int i) in  { A9383.val = i; failInBase; } do { }                        // no closure
+    void foo6(int i) in  { A9383.val = i; failInBase; } do { int x; dg = { ++x; }; }  // closure [local]
+    void foo7(int i) in  { A9383.val = i; failInBase; } do {        dg = { ++i; }; }  // closure [parameter]
 
     // out-contract tests
-    void bar1(int i) out { A9383.val = i;             } body { }                        // no closure
-    void bar2(int i) out { A9383.val = i;             } body { int x; dg = { ++x; }; }  // closure [local]
-    void bar3(int i) out { A9383.val = i;             } body {        dg = { ++i; }; }  // closure [parameter]
-    void bar4(int i) out { A9383.val = i;             } body { }                        // no closure
-    void bar5(int i) out { A9383.val = i;             } body { }                        // no closure
-    void bar6(int i) out { A9383.val = i;             } body { int x; dg = { ++x; }; }  // closure [local]
-    void bar7(int i) out { A9383.val = i;             } body {        dg = { ++i; }; }  // closure [parameter]
+    void bar1(int i) out { A9383.val = i;             } do { }                        // no closure
+    void bar2(int i) out { A9383.val = i;             } do { int x; dg = { ++x; }; }  // closure [local]
+    void bar3(int i) out { A9383.val = i;             } do {        dg = { ++i; }; }  // closure [parameter]
+    void bar4(int i) out { A9383.val = i;             } do { }                        // no closure
+    void bar5(int i) out { A9383.val = i;             } do { }                        // no closure
+    void bar6(int i) out { A9383.val = i;             } do { int x; dg = { ++x; }; }  // closure [local]
+    void bar7(int i) out { A9383.val = i;             } do {        dg = { ++i; }; }  // closure [parameter]
 }
 
 class B9383 : A9383
@@ -729,22 +768,22 @@ class B9383 : A9383
     static int val;
 
     // in-contract tests
-    override void foo1(int i) in  { B9383.val = i; } body { }                           // -> no closure
-    override void foo2(int i) in  { B9383.val = i; } body { int x; dg = { ++x; }; }     // -> closure [local] appears
-    override void foo3(int i) in  { B9383.val = i; } body {        dg = { ++i; }; }     // -> closure [parameter]
-    override void foo4(int i) in  { B9383.val = i; } body { int x; dg = { ++x; }; }     // -> closure [local] appears
-    override void foo5(int i) in  { B9383.val = i; } body {        dg = { ++i; }; }     // -> closure [parameter] appears
-    override void foo6(int i) in  { B9383.val = i; } body { }                           // -> closure [local] disappears
-    override void foo7(int i) in  { B9383.val = i; } body { }                           // -> closure [parameter] disappears
+    override void foo1(int i) in  { B9383.val = i; } do { }                           // -> no closure
+    override void foo2(int i) in  { B9383.val = i; } do { int x; dg = { ++x; }; }     // -> closure [local] appears
+    override void foo3(int i) in  { B9383.val = i; } do {        dg = { ++i; }; }     // -> closure [parameter]
+    override void foo4(int i) in  { B9383.val = i; } do { int x; dg = { ++x; }; }     // -> closure [local] appears
+    override void foo5(int i) in  { B9383.val = i; } do {        dg = { ++i; }; }     // -> closure [parameter] appears
+    override void foo6(int i) in  { B9383.val = i; } do { }                           // -> closure [local] disappears
+    override void foo7(int i) in  { B9383.val = i; } do { }                           // -> closure [parameter] disappears
 
     // out-contract tests
-    override void bar1(int i) out { B9383.val = i; } body { }                           // -> no closure
-    override void bar2(int i) out { B9383.val = i; } body { int x; dg = { ++x; }; }     // -> closure [local] appears
-    override void bar3(int i) out { B9383.val = i; } body {        dg = { ++i; }; }     // -> closure [parameter]
-    override void bar4(int i) out { B9383.val = i; } body { int x; dg = { ++x; }; }     // -> closure [local] appears
-    override void bar5(int i) out { B9383.val = i; } body {        dg = { ++i; }; }     // -> closure [parameter] appears
-    override void bar6(int i) out { B9383.val = i; } body { }                           // -> closure [local] disappears
-    override void bar7(int i) out { B9383.val = i; } body { }                           // -> closure [parameter] disappears
+    override void bar1(int i) out { B9383.val = i; } do { }                           // -> no closure
+    override void bar2(int i) out { B9383.val = i; } do { int x; dg = { ++x; }; }     // -> closure [local] appears
+    override void bar3(int i) out { B9383.val = i; } do {        dg = { ++i; }; }     // -> closure [parameter]
+    override void bar4(int i) out { B9383.val = i; } do { int x; dg = { ++x; }; }     // -> closure [local] appears
+    override void bar5(int i) out { B9383.val = i; } do {        dg = { ++i; }; }     // -> closure [parameter] appears
+    override void bar6(int i) out { B9383.val = i; } do { }                           // -> closure [local] disappears
+    override void bar7(int i) out { B9383.val = i; } do { }                           // -> closure [parameter] disappears
 }
 
 void test9383()
@@ -792,22 +831,22 @@ class A15524
     void failInBase() { assert(typeid(this) is typeid(A15524)); }
 
     // in-contract tests
-    void foo1(string s) in  { A15524.val = s; failInBase; } body { }                                // no closure
-    void foo2(string s) in  { A15524.val = s; failInBase; } body { string x; dg = { x = null; }; }  // closure [local]
-    void foo3(string s) in  { A15524.val = s; failInBase; } body {           dg = { s = null; }; }  // closure [parameter]
-    void foo4(string s) in  { A15524.val = s; failInBase; } body { }                                // no closure
-    void foo5(string s) in  { A15524.val = s; failInBase; } body { }                                // no closure
-    void foo6(string s) in  { A15524.val = s; failInBase; } body { string x; dg = { x = null; }; }  // closure [local]
-    void foo7(string s) in  { A15524.val = s; failInBase; } body {           dg = { s = null; }; }  // closure [parameter]
+    void foo1(string s) in  { A15524.val = s; failInBase; } do { }                                // no closure
+    void foo2(string s) in  { A15524.val = s; failInBase; } do { string x; dg = { x = null; }; }  // closure [local]
+    void foo3(string s) in  { A15524.val = s; failInBase; } do {           dg = { s = null; }; }  // closure [parameter]
+    void foo4(string s) in  { A15524.val = s; failInBase; } do { }                                // no closure
+    void foo5(string s) in  { A15524.val = s; failInBase; } do { }                                // no closure
+    void foo6(string s) in  { A15524.val = s; failInBase; } do { string x; dg = { x = null; }; }  // closure [local]
+    void foo7(string s) in  { A15524.val = s; failInBase; } do {           dg = { s = null; }; }  // closure [parameter]
 
     // out-contract tests
-    void bar1(string s) out { A15524.val = s;             } body { }                                // no closure
-    void bar2(string s) out { A15524.val = s;             } body { string x; dg = { x = null; }; }  // closure [local]
-    void bar3(string s) out { A15524.val = s;             } body {           dg = { s = null; }; }  // closure [parameter]
-    void bar4(string s) out { A15524.val = s;             } body { }                                // no closure
-    void bar5(string s) out { A15524.val = s;             } body { }                                // no closure
-    void bar6(string s) out { A15524.val = s;             } body { string x; dg = { x = null; }; }  // closure [local]
-    void bar7(string s) out { A15524.val = s;             } body {           dg = { s = null; }; }  // closure [parameter]
+    void bar1(string s) out { A15524.val = s;             } do { }                                // no closure
+    void bar2(string s) out { A15524.val = s;             } do { string x; dg = { x = null; }; }  // closure [local]
+    void bar3(string s) out { A15524.val = s;             } do {           dg = { s = null; }; }  // closure [parameter]
+    void bar4(string s) out { A15524.val = s;             } do { }                                // no closure
+    void bar5(string s) out { A15524.val = s;             } do { }                                // no closure
+    void bar6(string s) out { A15524.val = s;             } do { string x; dg = { x = null; }; }  // closure [local]
+    void bar7(string s) out { A15524.val = s;             } do {           dg = { s = null; }; }  // closure [parameter]
 }
 
 class B15524 : A15524
@@ -815,22 +854,22 @@ class B15524 : A15524
     static string val;
 
     // in-contract tests
-    override void foo1(string s) in  { B15524.val = s; } body { }                                   // -> no closure
-    override void foo2(string s) in  { B15524.val = s; } body { string x; dg = { x = null; }; }     // -> closure [local] appears
-    override void foo3(string s) in  { B15524.val = s; } body {           dg = { s = null; }; }     // -> closure [parameter]
-    override void foo4(string s) in  { B15524.val = s; } body { string x; dg = { x = null; }; }     // -> closure [local] appears
-    override void foo5(string s) in  { B15524.val = s; } body {           dg = { s = null; }; }     // -> closure [parameter] appears
-    override void foo6(string s) in  { B15524.val = s; } body { }                                   // -> closure [local] disappears
-    override void foo7(string s) in  { B15524.val = s; } body { }                                   // -> closure [parameter] disappears
+    override void foo1(string s) in  { B15524.val = s; } do { }                                   // -> no closure
+    override void foo2(string s) in  { B15524.val = s; } do { string x; dg = { x = null; }; }     // -> closure [local] appears
+    override void foo3(string s) in  { B15524.val = s; } do {           dg = { s = null; }; }     // -> closure [parameter]
+    override void foo4(string s) in  { B15524.val = s; } do { string x; dg = { x = null; }; }     // -> closure [local] appears
+    override void foo5(string s) in  { B15524.val = s; } do {           dg = { s = null; }; }     // -> closure [parameter] appears
+    override void foo6(string s) in  { B15524.val = s; } do { }                                   // -> closure [local] disappears
+    override void foo7(string s) in  { B15524.val = s; } do { }                                   // -> closure [parameter] disappears
 
     // out-contract tests
-    override void bar1(string s) out { B15524.val = s; } body { }                                   // -> no closure
-    override void bar2(string s) out { B15524.val = s; } body { string x; dg = { x = null; }; }     // -> closure [local] appears
-    override void bar3(string s) out { B15524.val = s; } body {           dg = { s = null; }; }     // -> closure [parameter]
-    override void bar4(string s) out { B15524.val = s; } body { string x; dg = { x = null; }; }     // -> closure [local] appears
-    override void bar5(string s) out { B15524.val = s; } body {           dg = { s = null; }; }     // -> closure [parameter] appears
-    override void bar6(string s) out { B15524.val = s; } body { }                                   // -> closure [local] disappears
-    override void bar7(string s) out { B15524.val = s; } body { }                                   // -> closure [parameter] disappears
+    override void bar1(string s) out { B15524.val = s; } do { }                                   // -> no closure
+    override void bar2(string s) out { B15524.val = s; } do { string x; dg = { x = null; }; }     // -> closure [local] appears
+    override void bar3(string s) out { B15524.val = s; } do {           dg = { s = null; }; }     // -> closure [parameter]
+    override void bar4(string s) out { B15524.val = s; } do { string x; dg = { x = null; }; }     // -> closure [local] appears
+    override void bar5(string s) out { B15524.val = s; } do {           dg = { s = null; }; }     // -> closure [parameter] appears
+    override void bar6(string s) out { B15524.val = s; } do { }                                   // -> closure [local] disappears
+    override void bar7(string s) out { B15524.val = s; } do { }                                   // -> closure [parameter] disappears
 }
 
 void test15524()
@@ -886,7 +925,7 @@ class Test15524a
     {
         assert(key !in infos); // @@@ crash here at second
     }
-    body
+    do
     {
         auto item = new class
         {
@@ -906,7 +945,7 @@ class Test15524b
     {
         assert(key == "second"); // @@@ fails
     }
-    body
+    do
     {
         static void delegate() dg;
         dg = { auto x = key; };
@@ -920,7 +959,7 @@ class Test15524b
 class B10479
 {
     B10479 foo()
-    out { } body { return null; }
+    out { } do { return null; }
 }
 
 class D10479 : B10479
@@ -935,7 +974,7 @@ class Foo10596
 {
     auto bar()
     out (result) { }
-    body { return 0; }
+    do { return 0; }
 }
 
 /*******************************************/
@@ -945,18 +984,18 @@ class Foo10721
 {
     this()
     out { }
-    body { }
+    do { }
 
     ~this()
     out { }
-    body { }
+    do { }
 }
 
 struct Bar10721
 {
     this(this)
     out { }
-    body { }
+    do { }
 }
 
 /*******************************************/
@@ -967,7 +1006,7 @@ class C10981
     void foo(int i) pure
     in { assert(i); }
     out { assert(i); }
-    body {}
+    do {}
 }
 
 /*******************************************/
@@ -978,7 +1017,7 @@ class C14779
     final void foo(int v)
     in  { assert(v == 0); }
     out { assert(v == 0); }
-    body
+    do
     {
     }
 }