tweaks to formatting and optimize map definitions

src/main/java/carpet/script/Expression.java

@@ -1727,7 +1727,7 @@ public class Expression
         // a few exceptions which we don't implement in the framework for simplicity for now
         if (!operation.pure())
         {
-            if (!symbol.equals("->") || expectedType != Context.Type.MAPDEF)
+            if (!(symbol.equals("->") || symbol.equals("define")) || expectedType != Context.Type.MAPDEF)
             {
                 return optimized;
             }

src/main/java/carpet/script/ScriptCommand.java

@@ -615,7 +615,7 @@ public class ScriptCommand
         {
             return Carpet.Messenger_compose(styleForToken(token) + " " + surface);
         }
-        return Carpet.Messenger_compose(styleForToken(token)+"br " + surface, "^gi " + token.comment);
+        return Carpet.Messenger_compose(styleForToken(token)+"u " + surface, "^gi " + token.comment);
     }
 
     private static String styleForToken(Token token)