diff --git a/macro.inc.php b/macro.inc.php
index b8b807d..3cd609d 100644
--- a/macro.inc.php
+++ b/macro.inc.php
@@ -114,7 +114,7 @@ function macro_SELF_CONF_ID($jsm)
   $proto_id = 0;
   $alias = "";
   if(!\taskman\config_get_header($file, $proto_id, $alias))
-    $proto_id = \taskman\config_get_id($file);
+    throw new Exception("No valid header for config: $file");
   return $proto_id;
 }
 
@@ -142,7 +142,7 @@ function macro_BOOL($jsm, $expr)
  */
 function macro_IS_DEV($jsm)
 {
-  return taskman_propor("GAME_IS_DEV", 0);
+  return \taskman\getor("GAME_IS_DEV", 0);
 }
 
 /**
@@ -169,3 +169,13 @@ function macro_ITEM($proc, $proto_id, $amount)
   return array('proto_id' => $proto_id, 'amount' => $amount);
 }
 
+/**
+ * @global @raw_args
+ */
+function macro_UNWRAP($jsm, $content)
+{
+  $content = trim($content);
+  $content = ltrim($content, '{');
+  $content = rtrim($content, '}');
+  return $content;
+}