sassc 1.11.1 → 1.11.2

data/ext/libsass/src/extend.hpp

@@ -13,36 +13,34 @@ namespace Sass {
   class Context;
   class Node;
 
-  typedef Subset_Map<std::string, std::pair<Sequence_Selector*, SimpleSequence_Selector*> > ExtensionSubsetMap;
-
   class Extend : public Operation_CRTP<void, Extend> {
 
     Context&            ctx;
-    ExtensionSubsetMap& subset_map;
+    Subset_Map& subset_map;
 
-    void fallback_impl(AST_Node* n) { }
+    void fallback_impl(AST_Node_Ptr n) { }
 
   public:
     static Node subweave(Node& one, Node& two, Context& ctx);
-    static CommaSequence_Selector* extendSelectorList(CommaSequence_Selector* pSelectorList, Context& ctx, ExtensionSubsetMap& subset_map, bool isReplace, bool& extendedSomething, std::set<SimpleSequence_Selector>& seen);
-    static CommaSequence_Selector* extendSelectorList(CommaSequence_Selector* pSelectorList, Context& ctx, ExtensionSubsetMap& subset_map, bool isReplace, bool& extendedSomething);
-    static CommaSequence_Selector* extendSelectorList(CommaSequence_Selector* pSelectorList, Context& ctx, ExtensionSubsetMap& subset_map, bool isReplace = false) {
+    static Selector_List_Ptr extendSelectorList(Selector_List_Obj pSelectorList, Context& ctx, Subset_Map& subset_map, bool isReplace, bool& extendedSomething, std::set<Compound_Selector>& seen);
+    static Selector_List_Ptr extendSelectorList(Selector_List_Obj pSelectorList, Context& ctx, Subset_Map& subset_map, bool isReplace, bool& extendedSomething);
+    static Selector_List_Ptr extendSelectorList(Selector_List_Obj pSelectorList, Context& ctx, Subset_Map& subset_map, bool isReplace = false) {
       bool extendedSomething = false;
       return extendSelectorList(pSelectorList, ctx, subset_map, isReplace, extendedSomething);
     }
-    static CommaSequence_Selector* extendSelectorList(CommaSequence_Selector* pSelectorList, Context& ctx, ExtensionSubsetMap& subset_map, std::set<SimpleSequence_Selector>& seen) {
+    static Selector_List_Ptr extendSelectorList(Selector_List_Obj pSelectorList, Context& ctx, Subset_Map& subset_map, std::set<Compound_Selector>& seen) {
       bool isReplace = false;
       bool extendedSomething = false;
       return extendSelectorList(pSelectorList, ctx, subset_map, isReplace, extendedSomething, seen);
     }
-    Extend(Context&, ExtensionSubsetMap&);
+    Extend(Context&, Subset_Map&);
     ~Extend() { }
 
-    void operator()(Block*);
-    void operator()(Ruleset*);
-    void operator()(Supports_Block*);
-    void operator()(Media_Block*);
-    void operator()(Directive*);
+    void operator()(Block_Ptr);
+    void operator()(Ruleset_Ptr);
+    void operator()(Supports_Block_Ptr);
+    void operator()(Media_Block_Ptr);
+    void operator()(Directive_Ptr);
 
     template <typename U>
     void fallback(U x) { return fallback_impl(x); }

data/ext/libsass/src/file.hpp

@@ -4,10 +4,9 @@
 #include <string>
 #include <vector>
 
-namespace Sass {
+#include "ast_fwd_decl.hpp"
 
-  class Block;
-  class Context;
+namespace Sass {
 
   namespace File {
 
@@ -105,9 +104,9 @@ namespace Sass {
   class StyleSheet : public Resource {
     public:
       // parsed root block
-      Block* root;
+      Block_Obj root;
     public:
-      StyleSheet(const Resource& res, Block* root)
+      StyleSheet(const Resource& res, Block_Obj root)
       : Resource(res), root(root)
       { }
   };

data/ext/libsass/src/functions.cpp

@@ -38,13 +38,13 @@ namespace Sass {
   using std::stringstream;
   using std::endl;
 
-  Definition* make_native_function(Signature sig, Native_Function func, Context& ctx)
+  Definition_Ptr make_native_function(Signature sig, Native_Function func, Context& ctx)
   {
     Parser sig_parser = Parser::from_c_str(sig, ctx, ParserState("[built-in function]"));
     sig_parser.lex<Prelexer::identifier>();
     std::string name(Util::normalize_underscores(sig_parser.lexed));
-    Parameters* params = sig_parser.parse_parameters();
-    return SASS_MEMORY_NEW(ctx.mem, Definition,
+    Parameters_Obj params = sig_parser.parse_parameters();
+    return SASS_MEMORY_NEW(Definition,
                            ParserState("[built-in function]"),
                            sig,
                            name,
@@ -53,7 +53,7 @@ namespace Sass {
                            false);
   }
 
-  Definition* make_c_function(Sass_Function_Entry c_func, Context& ctx)
+  Definition_Ptr make_c_function(Sass_Function_Entry c_func, Context& ctx)
   {
     using namespace Prelexer;
 
@@ -66,8 +66,8 @@ namespace Sass {
                                     exactly < Constants::debug_kwd >
                    >              >();
     std::string name(Util::normalize_underscores(sig_parser.lexed));
-    Parameters* params = sig_parser.parse_parameters();
-    return SASS_MEMORY_NEW(ctx.mem, Definition,
+    Parameters_Obj params = sig_parser.parse_parameters();
+    return SASS_MEMORY_NEW(Definition,
                            ParserState("[c function]"),
                            sig,
                            name,
@@ -108,7 +108,7 @@ namespace Sass {
     T* get_arg(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtrace* backtrace)
     {
       // Minimal error handling -- the expectation is that built-ins will be written correctly!
-      T* val = dynamic_cast<T*>(env[argname]);
+      T* val = dynamic_cast<T*>(&env[argname]);
       if (!val) {
         std::string msg("argument `");
         msg += argname;
@@ -121,24 +121,24 @@ namespace Sass {
       return val;
     }
 
-    Map* get_arg_m(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtrace* backtrace, Context& ctx)
+    Map_Ptr get_arg_m(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtrace* backtrace, Context& ctx)
     {
       // Minimal error handling -- the expectation is that built-ins will be written correctly!
-      Map* val = dynamic_cast<Map*>(env[argname]);
+      Map_Ptr val = SASS_MEMORY_CAST(Map, env[argname]);
       if (val) return val;
 
-      List* lval = dynamic_cast<List*>(env[argname]);
-      if (lval && lval->length() == 0) return SASS_MEMORY_NEW(ctx.mem, Map, pstate, 0);
+      List_Ptr lval = SASS_MEMORY_CAST(List, env[argname]);
+      if (lval && lval->length() == 0) return SASS_MEMORY_NEW(Map, pstate, 0);
 
       // fallback on get_arg for error handling
       val = get_arg<Map>(argname, env, sig, pstate, backtrace);
       return val;
     }
 
-    Number* get_arg_r(const std::string& argname, Env& env, Signature sig, ParserState pstate, double lo, double hi, Backtrace* backtrace)
+    Number_Ptr get_arg_r(const std::string& argname, Env& env, Signature sig, ParserState pstate, double lo, double hi, Backtrace* backtrace)
     {
       // Minimal error handling -- the expectation is that built-ins will be written correctly!
-      Number* val = get_arg<Number>(argname, env, sig, pstate, backtrace);
+      Number_Ptr val = get_arg<Number>(argname, env, sig, pstate, backtrace);
       double v = val->value();
       if (!(lo <= v && v <= hi)) {
         std::stringstream msg;
@@ -152,18 +152,18 @@ namespace Sass {
     #define ARGSEL(argname, seltype, contextualize) get_arg_sel<seltype>(argname, env, sig, pstate, backtrace, ctx)
 
     template <typename T>
-    T* get_arg_sel(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtrace* backtrace, Context& ctx);
+    T get_arg_sel(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtrace* backtrace, Context& ctx);
 
     template <>
-    CommaSequence_Selector* get_arg_sel(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtrace* backtrace, Context& ctx) {
-      Expression* exp = ARG(argname, Expression);
+    Selector_List_Obj get_arg_sel(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtrace* backtrace, Context& ctx) {
+      Expression_Obj exp = ARG(argname, Expression);
       if (exp->concrete_type() == Expression::NULL_VAL) {
         std::stringstream msg;
         msg << argname << ": null is not a valid selector: it must be a string,\n";
         msg << "a list of strings, or a list of lists of strings for `" << function_name(sig) << "'";
         error(msg.str(), pstate);
       }
-      if (String_Constant* str =dynamic_cast<String_Constant*>(exp)) {
+      if (String_Constant_Ptr str = SASS_MEMORY_CAST(String_Constant, exp)) {
         str->quote_mark(0);
       }
       std::string exp_src = exp->to_string(ctx.c_options) + "{";
@@ -171,36 +171,19 @@ namespace Sass {
     }
 
     template <>
-    Sequence_Selector* get_arg_sel(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtrace* backtrace, Context& ctx) {
-      Expression* exp = ARG(argname, Expression);
-      if (exp->concrete_type() == Expression::NULL_VAL) {
-        std::stringstream msg;
-        msg << argname << ": null is not a valid selector: it must be a string,\n";
-        msg << "a list of strings, or a list of lists of strings for `" << function_name(sig) << "'";
-        error(msg.str(), pstate);
-      }
-      if (String_Constant* str =dynamic_cast<String_Constant*>(exp)) {
-        str->quote_mark(0);
-      }
-      std::string exp_src = exp->to_string(ctx.c_options) + "{";
-      CommaSequence_Selector* sel_list = Parser::parse_selector(exp_src.c_str(), ctx);
-      return (sel_list->length() > 0) ? sel_list->first() : 0;
-    }
-
-    template <>
-    SimpleSequence_Selector* get_arg_sel(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtrace* backtrace, Context& ctx) {
-      Expression* exp = ARG(argname, Expression);
+    Compound_Selector_Obj get_arg_sel(const std::string& argname, Env& env, Signature sig, ParserState pstate, Backtrace* backtrace, Context& ctx) {
+      Expression_Obj exp = ARG(argname, Expression);
       if (exp->concrete_type() == Expression::NULL_VAL) {
         std::stringstream msg;
         msg << argname << ": null is not a string for `" << function_name(sig) << "'";
         error(msg.str(), pstate);
       }
-      if (String_Constant* str =dynamic_cast<String_Constant*>(exp)) {
+      if (String_Constant_Ptr str = SASS_MEMORY_CAST(String_Constant, exp)) {
         str->quote_mark(0);
       }
       std::string exp_src = exp->to_string(ctx.c_options) + "{";
-      CommaSequence_Selector* sel_list = Parser::parse_selector(exp_src.c_str(), ctx);
-      return (sel_list->length() > 0) ? sel_list->first()->tail()->head() : 0;
+      Selector_List_Obj sel_list = Parser::parse_selector(exp_src.c_str(), ctx);
+      return (sel_list->length() > 0) ? &sel_list->first()->tail()->head() : 0;
     }
 
     #ifdef __MINGW32__
@@ -243,7 +226,7 @@ namespace Sass {
     // RGB FUNCTIONS
     ////////////////
 
-    inline double color_num(Number* n) {
+    inline double color_num(Number_Ptr n) {
       if (n->unit() == "%") {
         return std::min(std::max(n->value() * 255 / 100.0, 0.0), 255.0);
       } else {
@@ -251,7 +234,7 @@ namespace Sass {
       }
     }
 
-    inline double alpha_num(Number* n) {
+    inline double alpha_num(Number_Ptr n) {
       if (n->unit() == "%") {
         return std::min(std::max(n->value(), 0.0), 100.0);
       } else {
@@ -262,7 +245,7 @@ namespace Sass {
     Signature rgb_sig = "rgb($red, $green, $blue)";
     BUILT_IN(rgb)
     {
-      return SASS_MEMORY_NEW(ctx.mem, Color,
+      return SASS_MEMORY_NEW(Color,
                              pstate,
                              color_num(ARG("$red",   Number)),
                              color_num(ARG("$green", Number)),
@@ -272,7 +255,7 @@ namespace Sass {
     Signature rgba_4_sig = "rgba($red, $green, $blue, $alpha)";
     BUILT_IN(rgba_4)
     {
-      return SASS_MEMORY_NEW(ctx.mem, Color,
+      return SASS_MEMORY_NEW(Color,
                              pstate,
                              color_num(ARG("$red",   Number)),
                              color_num(ARG("$green", Number)),
@@ -283,8 +266,8 @@ namespace Sass {
     Signature rgba_2_sig = "rgba($color, $alpha)";
     BUILT_IN(rgba_2)
     {
-      Color* c_arg = ARG("$color", Color);
-      Color* new_c = SASS_MEMORY_NEW(ctx.mem, Color, *c_arg);
+      Color_Ptr c_arg = ARG("$color", Color);
+      Color_Ptr new_c = SASS_MEMORY_COPY(c_arg);
       new_c->a(alpha_num(ARG("$alpha", Number)));
       new_c->disp("");
       return new_c;
@@ -292,22 +275,22 @@ namespace Sass {
 
     Signature red_sig = "red($color)";
     BUILT_IN(red)
-    { return SASS_MEMORY_NEW(ctx.mem, Number, pstate, ARG("$color", Color)->r()); }
+    { return SASS_MEMORY_NEW(Number, pstate, ARG("$color", Color)->r()); }
 
     Signature green_sig = "green($color)";
     BUILT_IN(green)
-    { return SASS_MEMORY_NEW(ctx.mem, Number, pstate, ARG("$color", Color)->g()); }
+    { return SASS_MEMORY_NEW(Number, pstate, ARG("$color", Color)->g()); }
 
     Signature blue_sig = "blue($color)";
     BUILT_IN(blue)
-    { return SASS_MEMORY_NEW(ctx.mem, Number, pstate, ARG("$color", Color)->b()); }
+    { return SASS_MEMORY_NEW(Number, pstate, ARG("$color", Color)->b()); }
 
     Signature mix_sig = "mix($color-1, $color-2, $weight: 50%)";
     BUILT_IN(mix)
     {
-      Color*  color1 = ARG("$color-1", Color);
-      Color*  color2 = ARG("$color-2", Color);
-      Number* weight = ARGR("$weight", Number, 0, 100);
+      Color_Ptr  color1 = ARG("$color-1", Color);
+      Color_Ptr  color2 = ARG("$color-2", Color);
+      Number_Ptr weight = ARGR("$weight", Number, 0, 100);
 
       double p = weight->value()/100;
       double w = 2*p - 1;
@@ -316,7 +299,7 @@ namespace Sass {
       double w1 = (((w * a == -1) ? w : (w + a)/(1 + w*a)) + 1)/2.0;
       double w2 = 1 - w1;
 
-      return SASS_MEMORY_NEW(ctx.mem, Color,
+      return SASS_MEMORY_NEW(Color,
                              pstate,
                              Sass::round(w1*color1->r() + w2*color2->r(), ctx.c_options.precision),
                              Sass::round(w1*color1->g() + w2*color2->g(), ctx.c_options.precision),
@@ -372,7 +355,7 @@ namespace Sass {
       return m1;
     }
 
-    Color* hsla_impl(double h, double s, double l, double a, Context& ctx, ParserState pstate)
+    Color_Ptr hsla_impl(double h, double s, double l, double a, Context& ctx, ParserState pstate)
     {
       h /= 360.0;
       s /= 100.0;
@@ -401,7 +384,7 @@ namespace Sass {
       double g = (h_to_rgb(m1, m2, h) * 255.0);
       double b = (h_to_rgb(m1, m2, h - 1.0/3.0) * 255.0);
 
-      return SASS_MEMORY_NEW(ctx.mem, Color, pstate, r, g, b, a);
+      return SASS_MEMORY_NEW(Color, pstate, r, g, b, a);
     }
 
     Signature hsl_sig = "hsl($hue, $saturation, $lightness)";
@@ -429,38 +412,38 @@ namespace Sass {
     Signature hue_sig = "hue($color)";
     BUILT_IN(hue)
     {
-      Color* rgb_color = ARG("$color", Color);
+      Color_Ptr rgb_color = ARG("$color", Color);
       HSL hsl_color = rgb_to_hsl(rgb_color->r(),
                                  rgb_color->g(),
                                  rgb_color->b());
-      return SASS_MEMORY_NEW(ctx.mem, Number, pstate, hsl_color.h, "deg");
+      return SASS_MEMORY_NEW(Number, pstate, hsl_color.h, "deg");
     }
 
     Signature saturation_sig = "saturation($color)";
     BUILT_IN(saturation)
     {
-      Color* rgb_color = ARG("$color", Color);
+      Color_Ptr rgb_color = ARG("$color", Color);
       HSL hsl_color = rgb_to_hsl(rgb_color->r(),
                                  rgb_color->g(),
                                  rgb_color->b());
-      return SASS_MEMORY_NEW(ctx.mem, Number, pstate, hsl_color.s, "%");
+      return SASS_MEMORY_NEW(Number, pstate, hsl_color.s, "%");
     }
 
     Signature lightness_sig = "lightness($color)";
     BUILT_IN(lightness)
     {
-      Color* rgb_color = ARG("$color", Color);
+      Color_Ptr rgb_color = ARG("$color", Color);
       HSL hsl_color = rgb_to_hsl(rgb_color->r(),
                                  rgb_color->g(),
                                  rgb_color->b());
-      return SASS_MEMORY_NEW(ctx.mem, Number, pstate, hsl_color.l, "%");
+      return SASS_MEMORY_NEW(Number, pstate, hsl_color.l, "%");
     }
 
     Signature adjust_hue_sig = "adjust-hue($color, $degrees)";
     BUILT_IN(adjust_hue)
     {
-      Color* rgb_color = ARG("$color", Color);
-      Number* degrees = ARG("$degrees", Number);
+      Color_Ptr rgb_color = ARG("$color", Color);
+      Number_Ptr degrees = ARG("$degrees", Number);
       HSL hsl_color = rgb_to_hsl(rgb_color->r(),
                                  rgb_color->g(),
                                  rgb_color->b());
@@ -475,8 +458,8 @@ namespace Sass {
     Signature lighten_sig = "lighten($color, $amount)";
     BUILT_IN(lighten)
     {
-      Color* rgb_color = ARG("$color", Color);
-      Number* amount = ARGR("$amount", Number, 0, 100);
+      Color_Ptr rgb_color = ARG("$color", Color);
+      Number_Ptr amount = ARGR("$amount", Number, 0, 100);
       HSL hsl_color = rgb_to_hsl(rgb_color->r(),
                                  rgb_color->g(),
                                  rgb_color->b());
@@ -497,8 +480,8 @@ namespace Sass {
     Signature darken_sig = "darken($color, $amount)";
     BUILT_IN(darken)
     {
-      Color* rgb_color = ARG("$color", Color);
-      Number* amount = ARGR("$amount", Number, 0, 100);
+      Color_Ptr rgb_color = ARG("$color", Color);
+      Number_Ptr amount = ARGR("$amount", Number, 0, 100);
       HSL hsl_color = rgb_to_hsl(rgb_color->r(),
                                  rgb_color->g(),
                                  rgb_color->b());
@@ -521,13 +504,13 @@ namespace Sass {
     BUILT_IN(saturate)
     {
       // CSS3 filter function overload: pass literal through directly
-      Number* amount = dynamic_cast<Number*>(env["$amount"]);
+      Number_Ptr amount = SASS_MEMORY_CAST(Number, env["$amount"]);
       if (!amount) {
-        return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, "saturate(" + env["$color"]->to_string(ctx.c_options) + ")");
+        return SASS_MEMORY_NEW(String_Quoted, pstate, "saturate(" + env["$color"]->to_string(ctx.c_options) + ")");
       }
 
       ARGR("$amount", Number, 0, 100);
-      Color* rgb_color = ARG("$color", Color);
+      Color_Ptr rgb_color = ARG("$color", Color);
       HSL hsl_color = rgb_to_hsl(rgb_color->r(),
                                  rgb_color->g(),
                                  rgb_color->b());
@@ -553,8 +536,8 @@ namespace Sass {
     Signature desaturate_sig = "desaturate($color, $amount)";
     BUILT_IN(desaturate)
     {
-      Color* rgb_color = ARG("$color", Color);
-      Number* amount = ARGR("$amount", Number, 0, 100);
+      Color_Ptr rgb_color = ARG("$color", Color);
+      Number_Ptr amount = ARGR("$amount", Number, 0, 100);
       HSL hsl_color = rgb_to_hsl(rgb_color->r(),
                                  rgb_color->g(),
                                  rgb_color->b());
@@ -581,12 +564,12 @@ namespace Sass {
     BUILT_IN(grayscale)
     {
       // CSS3 filter function overload: pass literal through directly
-      Number* amount = dynamic_cast<Number*>(env["$color"]);
+      Number_Ptr amount = SASS_MEMORY_CAST(Number, env["$color"]);
       if (amount) {
-        return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, "grayscale(" + amount->to_string(ctx.c_options) + ")");
+        return SASS_MEMORY_NEW(String_Quoted, pstate, "grayscale(" + amount->to_string(ctx.c_options) + ")");
       }
 
-      Color* rgb_color = ARG("$color", Color);
+      Color_Ptr rgb_color = ARG("$color", Color);
       HSL hsl_color = rgb_to_hsl(rgb_color->r(),
                                  rgb_color->g(),
                                  rgb_color->b());
@@ -601,7 +584,7 @@ namespace Sass {
     Signature complement_sig = "complement($color)";
     BUILT_IN(complement)
     {
-      Color* rgb_color = ARG("$color", Color);
+      Color_Ptr rgb_color = ARG("$color", Color);
       HSL hsl_color = rgb_to_hsl(rgb_color->r(),
                                  rgb_color->g(),
                                  rgb_color->b());
@@ -617,13 +600,13 @@ namespace Sass {
     BUILT_IN(invert)
     {
       // CSS3 filter function overload: pass literal through directly
-      Number* amount = dynamic_cast<Number*>(env["$color"]);
+      Number_Ptr amount = SASS_MEMORY_CAST(Number, env["$color"]);
       if (amount) {
-        return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, "invert(" + amount->to_string(ctx.c_options) + ")");
+        return SASS_MEMORY_NEW(String_Quoted, pstate, "invert(" + amount->to_string(ctx.c_options) + ")");
       }
 
-      Color* rgb_color = ARG("$color", Color);
-      return SASS_MEMORY_NEW(ctx.mem, Color,
+      Color_Ptr rgb_color = ARG("$color", Color);
+      return SASS_MEMORY_NEW(Color,
                              pstate,
                              255 - rgb_color->r(),
                              255 - rgb_color->g(),
@@ -638,28 +621,28 @@ namespace Sass {
     Signature opacity_sig = "opacity($color)";
     BUILT_IN(alpha)
     {
-      String_Constant* ie_kwd = dynamic_cast<String_Constant*>(env["$color"]);
+      String_Constant_Ptr ie_kwd = SASS_MEMORY_CAST(String_Constant, env["$color"]);
       if (ie_kwd) {
-        return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, "alpha(" + ie_kwd->value() + ")");
+        return SASS_MEMORY_NEW(String_Quoted, pstate, "alpha(" + ie_kwd->value() + ")");
       }
 
       // CSS3 filter function overload: pass literal through directly
-      Number* amount = dynamic_cast<Number*>(env["$color"]);
+      Number_Ptr amount = SASS_MEMORY_CAST(Number, env["$color"]);
       if (amount) {
-        return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, "opacity(" + amount->to_string(ctx.c_options) + ")");
+        return SASS_MEMORY_NEW(String_Quoted, pstate, "opacity(" + amount->to_string(ctx.c_options) + ")");
       }
 
-      return SASS_MEMORY_NEW(ctx.mem, Number, pstate, ARG("$color", Color)->a());
+      return SASS_MEMORY_NEW(Number, pstate, ARG("$color", Color)->a());
     }
 
     Signature opacify_sig = "opacify($color, $amount)";
     Signature fade_in_sig = "fade-in($color, $amount)";
     BUILT_IN(opacify)
     {
-      Color* color = ARG("$color", Color);
+      Color_Ptr color = ARG("$color", Color);
       double amount = ARGR("$amount", Number, 0, 1)->value();
       double alpha = std::min(color->a() + amount, 1.0);
-      return SASS_MEMORY_NEW(ctx.mem, Color,
+      return SASS_MEMORY_NEW(Color,
                              pstate,
                              color->r(),
                              color->g(),
@@ -671,10 +654,10 @@ namespace Sass {
     Signature fade_out_sig = "fade-out($color, $amount)";
     BUILT_IN(transparentize)
     {
-      Color* color = ARG("$color", Color);
+      Color_Ptr color = ARG("$color", Color);
       double amount = ARGR("$amount", Number, 0, 1)->value();
       double alpha = std::max(color->a() - amount, 0.0);
-      return SASS_MEMORY_NEW(ctx.mem, Color,
+      return SASS_MEMORY_NEW(Color,
                              pstate,
                              color->r(),
                              color->g(),
@@ -689,27 +672,27 @@ namespace Sass {
     Signature adjust_color_sig = "adjust-color($color, $red: false, $green: false, $blue: false, $hue: false, $saturation: false, $lightness: false, $alpha: false)";
     BUILT_IN(adjust_color)
     {
-      Color* color = ARG("$color", Color);
-      Number* r = dynamic_cast<Number*>(env["$red"]);
-      Number* g = dynamic_cast<Number*>(env["$green"]);
-      Number* b = dynamic_cast<Number*>(env["$blue"]);
-      Number* h = dynamic_cast<Number*>(env["$hue"]);
-      Number* s = dynamic_cast<Number*>(env["$saturation"]);
-      Number* l = dynamic_cast<Number*>(env["$lightness"]);
-      Number* a = dynamic_cast<Number*>(env["$alpha"]);
+      Color_Ptr color = ARG("$color", Color);
+      Number_Ptr r = SASS_MEMORY_CAST(Number, env["$red"]);
+      Number_Ptr g = SASS_MEMORY_CAST(Number, env["$green"]);
+      Number_Ptr b = SASS_MEMORY_CAST(Number, env["$blue"]);
+      Number_Ptr h = SASS_MEMORY_CAST(Number, env["$hue"]);
+      Number_Ptr s = SASS_MEMORY_CAST(Number, env["$saturation"]);
+      Number_Ptr l = SASS_MEMORY_CAST(Number, env["$lightness"]);
+      Number_Ptr a = SASS_MEMORY_CAST(Number, env["$alpha"]);
 
       bool rgb = r || g || b;
       bool hsl = h || s || l;
 
       if (rgb && hsl) {
-        error("cannot specify both RGB and HSL values for `adjust-color`", pstate);
+        error("Cannot specify HSL and RGB values for a color at the same time for `adjust-color'", pstate);
       }
       if (rgb) {
         double rr = r ? ARGR("$red",   Number, -255, 255)->value() : 0;
         double gg = g ? ARGR("$green", Number, -255, 255)->value() : 0;
         double bb = b ? ARGR("$blue",  Number, -255, 255)->value() : 0;
         double aa = a ? ARGR("$alpha", Number, -1, 1)->value() : 0;
-        return SASS_MEMORY_NEW(ctx.mem, Color,
+        return SASS_MEMORY_NEW(Color,
                                pstate,
                                color->r() + rr,
                                color->g() + gg,
@@ -729,14 +712,14 @@ namespace Sass {
                          pstate);
       }
       if (a) {
-        return SASS_MEMORY_NEW(ctx.mem, Color,
+        return SASS_MEMORY_NEW(Color,
                                pstate,
                                color->r(),
                                color->g(),
                                color->b(),
                                color->a() + (a ? a->value() : 0));
       }
-      error("not enough arguments for `adjust-color`", pstate);
+      error("not enough arguments for `adjust-color'", pstate);
       // unreachable
       return color;
     }
@@ -744,27 +727,27 @@ namespace Sass {
     Signature scale_color_sig = "scale-color($color, $red: false, $green: false, $blue: false, $hue: false, $saturation: false, $lightness: false, $alpha: false)";
     BUILT_IN(scale_color)
     {
-      Color* color = ARG("$color", Color);
-      Number* r = dynamic_cast<Number*>(env["$red"]);
-      Number* g = dynamic_cast<Number*>(env["$green"]);
-      Number* b = dynamic_cast<Number*>(env["$blue"]);
-      Number* h = dynamic_cast<Number*>(env["$hue"]);
-      Number* s = dynamic_cast<Number*>(env["$saturation"]);
-      Number* l = dynamic_cast<Number*>(env["$lightness"]);
-      Number* a = dynamic_cast<Number*>(env["$alpha"]);
+      Color_Ptr color = ARG("$color", Color);
+      Number_Ptr r = SASS_MEMORY_CAST(Number, env["$red"]);
+      Number_Ptr g = SASS_MEMORY_CAST(Number, env["$green"]);
+      Number_Ptr b = SASS_MEMORY_CAST(Number, env["$blue"]);
+      Number_Ptr h = SASS_MEMORY_CAST(Number, env["$hue"]);
+      Number_Ptr s = SASS_MEMORY_CAST(Number, env["$saturation"]);
+      Number_Ptr l = SASS_MEMORY_CAST(Number, env["$lightness"]);
+      Number_Ptr a = SASS_MEMORY_CAST(Number, env["$alpha"]);
 
       bool rgb = r || g || b;
       bool hsl = h || s || l;
 
       if (rgb && hsl) {
-        error("cannot specify both RGB and HSL values for `scale-color`", pstate);
+        error("Cannot specify HSL and RGB values for a color at the same time for `scale-color'", pstate);
       }
       if (rgb) {
         double rscale = (r ? ARGR("$red",   Number, -100.0, 100.0)->value() : 0.0) / 100.0;
         double gscale = (g ? ARGR("$green", Number, -100.0, 100.0)->value() : 0.0) / 100.0;
         double bscale = (b ? ARGR("$blue",  Number, -100.0, 100.0)->value() : 0.0) / 100.0;
         double ascale = (a ? ARGR("$alpha", Number, -100.0, 100.0)->value() : 0.0) / 100.0;
-        return SASS_MEMORY_NEW(ctx.mem, Color,
+        return SASS_MEMORY_NEW(Color,
                                pstate,
                                color->r() + rscale * (rscale > 0.0 ? 255 - color->r() : color->r()),
                                color->g() + gscale * (gscale > 0.0 ? 255 - color->g() : color->g()),
@@ -785,14 +768,14 @@ namespace Sass {
       }
       if (a) {
         double ascale = (a ? ARGR("$alpha", Number, -100.0, 100.0)->value() : 0.0) / 100.0;
-        return SASS_MEMORY_NEW(ctx.mem, Color,
+        return SASS_MEMORY_NEW(Color,
                                pstate,
                                color->r(),
                                color->g(),
                                color->b(),
                                color->a() + ascale * (ascale > 0.0 ? 1.0 - color->a() : color->a()));
       }
-      error("not enough arguments for `scale-color`", pstate);
+      error("not enough arguments for `scale-color'", pstate);
       // unreachable
       return color;
     }
@@ -800,23 +783,23 @@ namespace Sass {
     Signature change_color_sig = "change-color($color, $red: false, $green: false, $blue: false, $hue: false, $saturation: false, $lightness: false, $alpha: false)";
     BUILT_IN(change_color)
     {
-      Color* color = ARG("$color", Color);
-      Number* r = dynamic_cast<Number*>(env["$red"]);
-      Number* g = dynamic_cast<Number*>(env["$green"]);
-      Number* b = dynamic_cast<Number*>(env["$blue"]);
-      Number* h = dynamic_cast<Number*>(env["$hue"]);
-      Number* s = dynamic_cast<Number*>(env["$saturation"]);
-      Number* l = dynamic_cast<Number*>(env["$lightness"]);
-      Number* a = dynamic_cast<Number*>(env["$alpha"]);
+      Color_Ptr color = ARG("$color", Color);
+      Number_Ptr r = SASS_MEMORY_CAST(Number, env["$red"]);
+      Number_Ptr g = SASS_MEMORY_CAST(Number, env["$green"]);
+      Number_Ptr b = SASS_MEMORY_CAST(Number, env["$blue"]);
+      Number_Ptr h = SASS_MEMORY_CAST(Number, env["$hue"]);
+      Number_Ptr s = SASS_MEMORY_CAST(Number, env["$saturation"]);
+      Number_Ptr l = SASS_MEMORY_CAST(Number, env["$lightness"]);
+      Number_Ptr a = SASS_MEMORY_CAST(Number, env["$alpha"]);
 
       bool rgb = r || g || b;
       bool hsl = h || s || l;
 
       if (rgb && hsl) {
-        error("cannot specify both RGB and HSL values for `change-color`", pstate);
+        error("Cannot specify HSL and RGB values for a color at the same time for `change-color'", pstate);
       }
       if (rgb) {
-        return SASS_MEMORY_NEW(ctx.mem, Color,
+        return SASS_MEMORY_NEW(Color,
                                pstate,
                                r ? ARGR("$red",   Number, 0, 255)->value() : color->r(),
                                g ? ARGR("$green", Number, 0, 255)->value() : color->g(),
@@ -833,14 +816,14 @@ namespace Sass {
       }
       if (a) {
         double alpha = a ? ARGR("$alpha", Number, 0, 1.0)->value() : color->a();
-        return SASS_MEMORY_NEW(ctx.mem, Color,
+        return SASS_MEMORY_NEW(Color,
                                pstate,
                                color->r(),
                                color->g(),
                                color->b(),
                                alpha);
       }
-      error("not enough arguments for `change-color`", pstate);
+      error("not enough arguments for `change-color'", pstate);
       // unreachable
       return color;
     }
@@ -855,7 +838,7 @@ namespace Sass {
     Signature ie_hex_str_sig = "ie-hex-str($color)";
     BUILT_IN(ie_hex_str)
     {
-      Color* c = ARG("$color", Color);
+      Color_Ptr c = ARG("$color", Color);
       double r = cap_channel<0xff>(c->r());
       double g = cap_channel<0xff>(c->g());
       double b = cap_channel<0xff>(c->b());
@@ -872,7 +855,7 @@ namespace Sass {
       for (size_t i = 0, L = result.length(); i < L; ++i) {
         result[i] = std::toupper(result[i]);
       }
-      return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, result);
+      return SASS_MEMORY_NEW(String_Quoted, pstate, result);
     }
 
     ///////////////////
@@ -882,40 +865,40 @@ namespace Sass {
     Signature unquote_sig = "unquote($string)";
     BUILT_IN(sass_unquote)
     {
-      AST_Node* arg = env["$string"];
-      if (String_Quoted* string_quoted = dynamic_cast<String_Quoted*>(arg)) {
-        String_Constant* result = SASS_MEMORY_NEW(ctx.mem, String_Constant, pstate, string_quoted->value());
+      AST_Node_Obj arg = env["$string"];
+      if (String_Quoted_Ptr string_quoted = SASS_MEMORY_CAST(String_Quoted, arg)) {
+        String_Constant_Ptr result = SASS_MEMORY_NEW(String_Constant, pstate, string_quoted->value());
         // remember if the string was quoted (color tokens)
         result->is_delayed(true); // delay colors
         return result;
       }
-      else if (dynamic_cast<String_Constant*>(arg)) {
-        return (Expression*) arg;
+      else if (SASS_MEMORY_CAST(String_Constant, arg)) {
+        return (Expression_Ptr) &arg;
       }
       else {
         Sass_Output_Style oldstyle = ctx.c_options.output_style;
         ctx.c_options.output_style = SASS_STYLE_NESTED;
         std::string val(arg->to_string(ctx.c_options));
-        val = dynamic_cast<Null*>(arg) ? "null" : val;
+        val = SASS_MEMORY_CAST(Null, arg) ? "null" : val;
         ctx.c_options.output_style = oldstyle;
 
         deprecated_function("Passing " + val + ", a non-string value, to unquote()", pstate);
-        return (Expression*) arg;
+        return (Expression_Ptr) &arg;
       }
     }
 
     Signature quote_sig = "quote($string)";
     BUILT_IN(sass_quote)
     {
-      AST_Node* arg = env["$string"];
+      AST_Node_Obj arg = env["$string"];
       // only set quote mark to true if already a string
-      if (String_Quoted* qstr = dynamic_cast<String_Quoted*>(arg)) {
+      if (String_Quoted_Ptr qstr = SASS_MEMORY_CAST(String_Quoted, arg)) {
         qstr->quote_mark('*');
         return qstr;
       }
       // all other nodes must be converted to a string node
       std::string str(quote(arg->to_string(ctx.c_options), String_Constant::double_quote()));
-      String_Quoted* result = SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, str);
+      String_Quoted_Ptr result = SASS_MEMORY_NEW(String_Quoted, pstate, str);
       result->quote_mark('*');
       return result;
     }
@@ -926,7 +909,7 @@ namespace Sass {
     {
       size_t len = std::string::npos;
       try {
-        String_Constant* s = ARG("$string", String_Constant);
+        String_Constant_Ptr s = ARG("$string", String_Constant);
         len = UTF_8::code_point_count(s->value(), 0, s->value().size());
 
       }
@@ -934,7 +917,7 @@ namespace Sass {
       // other errors will be re-thrown
       catch (...) { handle_utf8_error(pstate, backtrace); }
       // return something even if we had an error (-1)
-      return SASS_MEMORY_NEW(ctx.mem, Number, pstate, (double)len);
+      return SASS_MEMORY_NEW(Number, pstate, (double)len);
     }
 
     Signature str_insert_sig = "str-insert($string, $insert, $index)";
@@ -942,13 +925,13 @@ namespace Sass {
     {
       std::string str;
       try {
-        String_Constant* s = ARG("$string", String_Constant);
+        String_Constant_Ptr s = ARG("$string", String_Constant);
         str = s->value();
         str = unquote(str);
-        String_Constant* i = ARG("$insert", String_Constant);
+        String_Constant_Ptr i = ARG("$insert", String_Constant);
         std::string ins = i->value();
         ins = unquote(ins);
-        Number* ind = ARG("$index", Number);
+        Number_Ptr ind = ARG("$index", Number);
         double index = ind->value();
         size_t len = UTF_8::code_point_count(str, 0, str.size());
 
@@ -973,14 +956,14 @@ namespace Sass {
           str = ins + str;
         }
 
-        if (String_Quoted* ss = dynamic_cast<String_Quoted*>(s)) {
+        if (String_Quoted_Ptr ss = SASS_MEMORY_CAST_PTR(String_Quoted, s)) {
           if (ss->quote_mark()) str = quote(str);
         }
       }
       // handle any invalid utf8 errors
       // other errors will be re-thrown
       catch (...) { handle_utf8_error(pstate, backtrace); }
-      return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, str);
+      return SASS_MEMORY_NEW(String_Quoted, pstate, str);
     }
 
     Signature str_index_sig = "str-index($string, $substring)";
@@ -988,8 +971,8 @@ namespace Sass {
     {
       size_t index = std::string::npos;
       try {
-        String_Constant* s = ARG("$string", String_Constant);
-        String_Constant* t = ARG("$substring", String_Constant);
+        String_Constant_Ptr s = ARG("$string", String_Constant);
+        String_Constant_Ptr t = ARG("$substring", String_Constant);
         std::string str = s->value();
         str = unquote(str);
         std::string substr = t->value();
@@ -997,7 +980,7 @@ namespace Sass {
 
         size_t c_index = str.find(substr);
         if(c_index == std::string::npos) {
-          return SASS_MEMORY_NEW(ctx.mem, Null, pstate);
+          return SASS_MEMORY_NEW(Null, pstate);
         }
         index = UTF_8::code_point_count(str, 0, c_index) + 1;
       }
@@ -1005,7 +988,7 @@ namespace Sass {
       // other errors will be re-thrown
       catch (...) { handle_utf8_error(pstate, backtrace); }
       // return something even if we had an error (-1)
-      return SASS_MEMORY_NEW(ctx.mem, Number, pstate, (double)index);
+      return SASS_MEMORY_NEW(Number, pstate, (double)index);
     }
 
     Signature str_slice_sig = "str-slice($string, $start-at, $end-at:-1)";
@@ -1013,22 +996,22 @@ namespace Sass {
     {
       std::string newstr;
       try {
-        String_Constant* s = ARG("$string", String_Constant);
+        String_Constant_Ptr s = ARG("$string", String_Constant);
         double start_at = ARG("$start-at", Number)->value();
         double end_at = ARG("$end-at", Number)->value();
-        String_Quoted* ss = dynamic_cast<String_Quoted*>(s);
+        String_Quoted_Ptr ss = SASS_MEMORY_CAST_PTR(String_Quoted, s);
 
         std::string str = unquote(s->value());
 
         size_t size = utf8::distance(str.begin(), str.end());
 
-        if (!dynamic_cast<Number*>(env["$end-at"])) {
+        if (!SASS_MEMORY_CAST(Number, env["$end-at"])) {
           end_at = -1;
         }
 
         if (end_at == 0 || (end_at + size) < 0) {
           if (ss && ss->quote_mark()) newstr = quote("");
-          return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, newstr);
+          return SASS_MEMORY_NEW(String_Quoted, pstate, newstr);
         }
 
         if (end_at < 0) {
@@ -1050,20 +1033,20 @@ namespace Sass {
           utf8::advance(end, end_at - start_at + 1, str.end());
           newstr = std::string(start, end);
         }
-        if (String_Quoted* ss = dynamic_cast<String_Quoted*>(s)) {
+        if (ss) {
           if(ss->quote_mark()) newstr = quote(newstr);
         }
       }
       // handle any invalid utf8 errors
       // other errors will be re-thrown
       catch (...) { handle_utf8_error(pstate, backtrace); }
-      return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, newstr);
+      return SASS_MEMORY_NEW(String_Quoted, pstate, newstr);
     }
 
     Signature to_upper_case_sig = "to-upper-case($string)";
     BUILT_IN(to_upper_case)
     {
-      String_Constant* s = ARG("$string", String_Constant);
+      String_Constant_Ptr s = ARG("$string", String_Constant);
       std::string str = s->value();
 
       for (size_t i = 0, L = str.length(); i < L; ++i) {
@@ -1072,19 +1055,19 @@ namespace Sass {
         }
       }
 
-      if (String_Quoted* ss = dynamic_cast<String_Quoted*>(s)) {
-        String_Quoted* cpy = SASS_MEMORY_NEW(ctx.mem, String_Quoted, *ss);
+      if (String_Quoted_Ptr ss = SASS_MEMORY_CAST_PTR(String_Quoted, s)) {
+        String_Quoted_Ptr cpy = SASS_MEMORY_COPY(ss);
         cpy->value(str);
         return cpy;
       } else {
-        return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, str);
+        return SASS_MEMORY_NEW(String_Quoted, pstate, str);
       }
     }
 
     Signature to_lower_case_sig = "to-lower-case($string)";
     BUILT_IN(to_lower_case)
     {
-      String_Constant* s = ARG("$string", String_Constant);
+      String_Constant_Ptr s = ARG("$string", String_Constant);
       std::string str = s->value();
 
       for (size_t i = 0, L = str.length(); i < L; ++i) {
@@ -1093,12 +1076,12 @@ namespace Sass {
         }
       }
 
-      if (String_Quoted* ss = dynamic_cast<String_Quoted*>(s)) {
-        String_Quoted* cpy = SASS_MEMORY_NEW(ctx.mem, String_Quoted, *ss);
+      if (String_Quoted_Ptr ss = SASS_MEMORY_CAST_PTR(String_Quoted, s)) {
+        String_Quoted_Ptr cpy = SASS_MEMORY_COPY(ss);
         cpy->value(str);
         return cpy;
       } else {
-        return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, str);
+        return SASS_MEMORY_NEW(String_Quoted, pstate, str);
       }
     }
 
@@ -1109,16 +1092,16 @@ namespace Sass {
     Signature percentage_sig = "percentage($number)";
     BUILT_IN(percentage)
     {
-      Number* n = ARG("$number", Number);
+      Number_Ptr n = ARG("$number", Number);
       if (!n->is_unitless()) error("argument $number of `" + std::string(sig) + "` must be unitless", pstate);
-      return SASS_MEMORY_NEW(ctx.mem, Number, pstate, n->value() * 100, "%");
+      return SASS_MEMORY_NEW(Number, pstate, n->value() * 100, "%");
     }
 
     Signature round_sig = "round($number)";
     BUILT_IN(round)
     {
-      Number* n = ARG("$number", Number);
-      Number* r = SASS_MEMORY_NEW(ctx.mem, Number, *n);
+      Number_Ptr n = ARG("$number", Number);
+      Number_Ptr r = SASS_MEMORY_COPY(n);
       r->pstate(pstate);
       r->value(Sass::round(r->value(), ctx.c_options.precision));
       return r;
@@ -1127,8 +1110,8 @@ namespace Sass {
     Signature ceil_sig = "ceil($number)";
     BUILT_IN(ceil)
     {
-      Number* n = ARG("$number", Number);
-      Number* r = SASS_MEMORY_NEW(ctx.mem, Number, *n);
+      Number_Ptr n = ARG("$number", Number);
+      Number_Ptr r = SASS_MEMORY_COPY(n);
       r->pstate(pstate);
       r->value(std::ceil(r->value()));
       return r;
@@ -1137,8 +1120,8 @@ namespace Sass {
     Signature floor_sig = "floor($number)";
     BUILT_IN(floor)
     {
-      Number* n = ARG("$number", Number);
-      Number* r = SASS_MEMORY_NEW(ctx.mem, Number, *n);
+      Number_Ptr n = ARG("$number", Number);
+      Number_Ptr r = SASS_MEMORY_COPY(n);
       r->pstate(pstate);
       r->value(std::floor(r->value()));
       return r;
@@ -1147,8 +1130,8 @@ namespace Sass {
     Signature abs_sig = "abs($number)";
     BUILT_IN(abs)
     {
-      Number* n = ARG("$number", Number);
-      Number* r = SASS_MEMORY_NEW(ctx.mem, Number, *n);
+      Number_Ptr n = ARG("$number", Number);
+      Number_Ptr r = SASS_MEMORY_COPY(n);
       r->pstate(pstate);
       r->value(std::abs(r->value()));
       return r;
@@ -1157,11 +1140,11 @@ namespace Sass {
     Signature min_sig = "min($numbers...)";
     BUILT_IN(min)
     {
-      List* arglist = ARG("$numbers", List);
-      Number* least = 0;
+      List_Ptr arglist = ARG("$numbers", List);
+      Number_Obj least = NULL;
       for (size_t i = 0, L = arglist->length(); i < L; ++i) {
-        Expression* val = arglist->value_at_index(i);
-        Number* xi = dynamic_cast<Number*>(val);
+        Expression_Obj val = arglist->value_at_index(i);
+        Number_Obj xi = SASS_MEMORY_CAST(Number, val);
         if (!xi) {
           error("\"" + val->to_string(ctx.c_options) + "\" is not a number for `min'", pstate);
         }
@@ -1169,17 +1152,17 @@ namespace Sass {
           if (*xi < *least) least = xi;
         } else least = xi;
       }
-      return least;
+      return least.detach();
     }
 
     Signature max_sig = "max($numbers...)";
     BUILT_IN(max)
     {
-      List* arglist = ARG("$numbers", List);
-      Number* greatest = 0;
+      List_Ptr arglist = ARG("$numbers", List);
+      Number_Obj greatest = NULL;
       for (size_t i = 0, L = arglist->length(); i < L; ++i) {
-        Expression* val = arglist->value_at_index(i);
-        Number* xi = dynamic_cast<Number*>(val);
+        Expression_Obj val = arglist->value_at_index(i);
+        Number_Obj xi = SASS_MEMORY_CAST(Number, val);
         if (!xi) {
           error("\"" + val->to_string(ctx.c_options) + "\" is not a number for `max'", pstate);
         }
@@ -1187,37 +1170,37 @@ namespace Sass {
           if (*greatest < *xi) greatest = xi;
         } else greatest = xi;
       }
-      return greatest;
+      return greatest.detach();
     }
 
     Signature random_sig = "random($limit:false)";
     BUILT_IN(random)
     {
-      AST_Node* arg = env["$limit"];
-      Value* v = dynamic_cast<Value*>(arg);
-      Number* l = dynamic_cast<Number*>(arg);
-      Boolean* b = dynamic_cast<Boolean*>(arg);
+      AST_Node_Obj arg = env["$limit"];
+      Value_Ptr v = SASS_MEMORY_CAST(Value, arg);
+      Number_Ptr l = SASS_MEMORY_CAST(Number, arg);
+      Boolean_Ptr b = SASS_MEMORY_CAST(Boolean, arg);
       if (l) {
         double v = l->value();
         if (v < 1) {
           stringstream err;
-          err << "$limit " << v << " must be greater than or equal to 1 for `random`";
+          err << "$limit " << v << " must be greater than or equal to 1 for `random'";
           error(err.str(), pstate);
         }
         bool eq_int = std::fabs(trunc(v) - v) < NUMBER_EPSILON;
         if (!eq_int) {
           stringstream err;
-          err << "Expected $limit to be an integer but got `" << v << "` for `random`";
+          err << "Expected $limit to be an integer but got " << v << " for `random'";
           error(err.str(), pstate);
         }
         std::uniform_real_distribution<> distributor(1, v + 1);
         uint_fast32_t distributed = static_cast<uint_fast32_t>(distributor(rand));
-        return SASS_MEMORY_NEW(ctx.mem, Number, pstate, (double)distributed);
+        return SASS_MEMORY_NEW(Number, pstate, (double)distributed);
       }
       else if (b) {
         std::uniform_real_distribution<> distributor(0, 1);
         double distributed = static_cast<double>(distributor(rand));
-        return SASS_MEMORY_NEW(ctx.mem, Number, pstate, distributed);
+        return SASS_MEMORY_NEW(Number, pstate, distributed);
       } else if (v) {
         throw Exception::InvalidArgumentType(pstate, "random", "$limit", "number", v);
       } else {
@@ -1233,26 +1216,26 @@ namespace Sass {
     Signature length_sig = "length($list)";
     BUILT_IN(length)
     {
-      if (CommaSequence_Selector* sl = dynamic_cast<CommaSequence_Selector*>(env["$list"])) {
-        return SASS_MEMORY_NEW(ctx.mem, Number, pstate, (double)sl->length());
+      if (Selector_List_Ptr sl = SASS_MEMORY_CAST(Selector_List, env["$list"])) {
+        return SASS_MEMORY_NEW(Number, pstate, (double)sl->length());
       }
-      Expression* v = ARG("$list", Expression);
+      Expression_Ptr v = ARG("$list", Expression);
       if (v->concrete_type() == Expression::MAP) {
-        Map* map = dynamic_cast<Map*>(env["$list"]);
-        return SASS_MEMORY_NEW(ctx.mem, Number, pstate, (double)(map ? map->length() : 1));
+        Map_Ptr map = SASS_MEMORY_CAST(Map, env["$list"]);
+        return SASS_MEMORY_NEW(Number, pstate, (double)(map ? map->length() : 1));
       }
       if (v->concrete_type() == Expression::SELECTOR) {
-        if (SimpleSequence_Selector* h = dynamic_cast<SimpleSequence_Selector*>(v)) {
-          return SASS_MEMORY_NEW(ctx.mem, Number, pstate, (double)h->length());
-        } else if (CommaSequence_Selector* ls = dynamic_cast<CommaSequence_Selector*>(v)) {
-          return SASS_MEMORY_NEW(ctx.mem, Number, pstate, (double)ls->length());
+        if (Compound_Selector_Ptr h = dynamic_cast<Compound_Selector_Ptr>(v)) {
+          return SASS_MEMORY_NEW(Number, pstate, (double)h->length());
+        } else if (Selector_List_Ptr ls = SASS_MEMORY_CAST_PTR(Selector_List, v)) {
+          return SASS_MEMORY_NEW(Number, pstate, (double)ls->length());
         } else {
-          return SASS_MEMORY_NEW(ctx.mem, Number, pstate, 1);
+          return SASS_MEMORY_NEW(Number, pstate, 1);
         }
       }
 
-      List* list = dynamic_cast<List*>(env["$list"]);
-      return SASS_MEMORY_NEW(ctx.mem, Number,
+      List_Ptr list = SASS_MEMORY_CAST(List, env["$list"]);
+      return SASS_MEMORY_NEW(Number,
                              pstate,
                              (double)(list ? list->size() : 1));
     }
@@ -1260,24 +1243,24 @@ namespace Sass {
     Signature nth_sig = "nth($list, $n)";
     BUILT_IN(nth)
     {
-      Number* n = ARG("$n", Number);
-      Map* m = dynamic_cast<Map*>(env["$list"]);
-      if (CommaSequence_Selector* sl = dynamic_cast<CommaSequence_Selector*>(env["$list"])) {
+      Number_Ptr n = ARG("$n", Number);
+      Map_Ptr m = SASS_MEMORY_CAST(Map, env["$list"]);
+      if (Selector_List_Ptr sl = SASS_MEMORY_CAST(Selector_List, env["$list"])) {
         size_t len = m ? m->length() : sl->length();
         bool empty = m ? m->empty() : sl->empty();
         if (empty) error("argument `$list` of `" + std::string(sig) + "` must not be empty", pstate);
         double index = std::floor(n->value() < 0 ? len + n->value() : n->value() - 1);
         if (index < 0 || index > len - 1) error("index out of bounds for `" + std::string(sig) + "`", pstate);
         // return (*sl)[static_cast<int>(index)];
-        Listize listize(ctx.mem);
+        Listize listize;
         return (*sl)[static_cast<int>(index)]->perform(&listize);
       }
-      List* l = dynamic_cast<List*>(env["$list"]);
+      List_Obj l = SASS_MEMORY_CAST(List, env["$list"]);
       if (n->value() == 0) error("argument `$n` of `" + std::string(sig) + "` must be non-zero", pstate);
       // if the argument isn't a list, then wrap it in a singleton list
       if (!m && !l) {
-        l = SASS_MEMORY_NEW(ctx.mem, List, pstate, 1);
-        *l << ARG("$list", Expression);
+        l = SASS_MEMORY_NEW(List, pstate, 1);
+        l->append(ARG("$list", Expression));
       }
       size_t len = m ? m->length() : l->length();
       bool empty = m ? m->empty() : l->empty();
@@ -1286,28 +1269,28 @@ namespace Sass {
       if (index < 0 || index > len - 1) error("index out of bounds for `" + std::string(sig) + "`", pstate);
 
       if (m) {
-        l = SASS_MEMORY_NEW(ctx.mem, List, pstate, 1);
-        *l << m->keys()[static_cast<unsigned int>(index)];
-        *l << m->at(m->keys()[static_cast<unsigned int>(index)]);
-        return l;
+        l = SASS_MEMORY_NEW(List, pstate, 1);
+        l->append(m->keys()[static_cast<unsigned int>(index)]);
+        l->append(m->at(m->keys()[static_cast<unsigned int>(index)]));
+        return l.detach();
       }
       else {
-        Expression* rv = l->value_at_index(static_cast<int>(index));
+        Expression_Obj rv = l->value_at_index(static_cast<int>(index));
         rv->set_delayed(false);
-        return rv;
+        return rv.detach();
       }
     }
 
     Signature set_nth_sig = "set-nth($list, $n, $value)";
     BUILT_IN(set_nth)
     {
-      Map* m = dynamic_cast<Map*>(env["$list"]);
-      List* l = dynamic_cast<List*>(env["$list"]);
-      Number* n = ARG("$n", Number);
-      Expression* v = ARG("$value", Expression);
+      Map_Obj m = SASS_MEMORY_CAST(Map, env["$list"]);
+      List_Obj l = SASS_MEMORY_CAST(List, env["$list"]);
+      Number_Obj n = ARG("$n", Number);
+      Expression_Obj v = ARG("$value", Expression);
       if (!l) {
-        l = SASS_MEMORY_NEW(ctx.mem, List, pstate, 1);
-        *l << ARG("$list", Expression);
+        l = SASS_MEMORY_NEW(List, pstate, 1);
+        l->append(ARG("$list", Expression));
       }
       if (m) {
         l = m->to_list(ctx, pstate);
@@ -1315,9 +1298,9 @@ namespace Sass {
       if (l->empty()) error("argument `$list` of `" + std::string(sig) + "` must not be empty", pstate);
       double index = std::floor(n->value() < 0 ? l->length() + n->value() : n->value() - 1);
       if (index < 0 || index > l->length() - 1) error("index out of bounds for `" + std::string(sig) + "`", pstate);
-      List* result = SASS_MEMORY_NEW(ctx.mem, List, pstate, l->length(), l->separator());
+      List_Ptr result = SASS_MEMORY_NEW(List, pstate, l->length(), l->separator());
       for (size_t i = 0, L = l->length(); i < L; ++i) {
-        *result << ((i == index) ? v : (*l)[i]);
+        result->append(((i == index) ? v : (*l)[i]));
       }
       return result;
     }
@@ -1325,39 +1308,39 @@ namespace Sass {
     Signature index_sig = "index($list, $value)";
     BUILT_IN(index)
     {
-      Map* m = dynamic_cast<Map*>(env["$list"]);
-      List* l = dynamic_cast<List*>(env["$list"]);
-      Expression* v = ARG("$value", Expression);
+      Map_Obj m = SASS_MEMORY_CAST(Map, env["$list"]);
+      List_Obj l = SASS_MEMORY_CAST(List, env["$list"]);
+      Expression_Obj v = ARG("$value", Expression);
       if (!l) {
-        l = SASS_MEMORY_NEW(ctx.mem, List, pstate, 1);
-        *l << ARG("$list", Expression);
+        l = SASS_MEMORY_NEW(List, pstate, 1);
+        l->append(ARG("$list", Expression));
       }
       if (m) {
         l = m->to_list(ctx, pstate);
       }
       for (size_t i = 0, L = l->length(); i < L; ++i) {
-        if (Eval::eq(l->value_at_index(i), v)) return SASS_MEMORY_NEW(ctx.mem, Number, pstate, (double)(i+1));
+        if (Eval::eq(l->value_at_index(i), v)) return SASS_MEMORY_NEW(Number, pstate, (double)(i+1));
       }
-      return SASS_MEMORY_NEW(ctx.mem, Null, pstate);
+      return SASS_MEMORY_NEW(Null, pstate);
     }
 
     Signature join_sig = "join($list1, $list2, $separator: auto)";
     BUILT_IN(join)
     {
-      Map* m1 = dynamic_cast<Map*>(env["$list1"]);
-      Map* m2 = dynamic_cast<Map*>(env["$list2"]);
-      List* l1 = dynamic_cast<List*>(env["$list1"]);
-      List* l2 = dynamic_cast<List*>(env["$list2"]);
-      String_Constant* sep = ARG("$separator", String_Constant);
+      Map_Obj m1 = SASS_MEMORY_CAST(Map, env["$list1"]);
+      Map_Obj m2 = SASS_MEMORY_CAST(Map, env["$list2"]);
+      List_Obj l1 = SASS_MEMORY_CAST(List, env["$list1"]);
+      List_Obj l2 = SASS_MEMORY_CAST(List, env["$list2"]);
+      String_Constant_Obj sep = ARG("$separator", String_Constant);
       enum Sass_Separator sep_val = (l1 ? l1->separator() : SASS_SPACE);
       if (!l1) {
-        l1 = SASS_MEMORY_NEW(ctx.mem, List, pstate, 1);
-        *l1 << ARG("$list1", Expression);
+        l1 = SASS_MEMORY_NEW(List, pstate, 1);
+        l1->append(ARG("$list1", Expression));
         sep_val = (l2 ? l2->separator() : SASS_SPACE);
       }
       if (!l2) {
-        l2 = SASS_MEMORY_NEW(ctx.mem, List, pstate, 1);
-        *l2 << ARG("$list2", Expression);
+        l2 = SASS_MEMORY_NEW(List, pstate, 1);
+        l2->append(ARG("$list2", Expression));
       }
       if (m1) {
         l1 = m1->to_list(ctx, pstate);
@@ -1371,48 +1354,47 @@ namespace Sass {
       if (sep_str == "space") sep_val = SASS_SPACE;
       else if (sep_str == "comma") sep_val = SASS_COMMA;
       else if (sep_str != "auto") error("argument `$separator` of `" + std::string(sig) + "` must be `space`, `comma`, or `auto`", pstate);
-      List* result = SASS_MEMORY_NEW(ctx.mem, List, pstate, len, sep_val);
-      *result += l1;
-      *result += l2;
-      return result;
+      List_Obj result = SASS_MEMORY_NEW(List, pstate, len, sep_val);
+      result->concat(&l1);
+      result->concat(&l2);
+      return result.detach();
     }
 
     Signature append_sig = "append($list, $val, $separator: auto)";
     BUILT_IN(append)
     {
-      Map* m = dynamic_cast<Map*>(env["$list"]);
-      List* l = dynamic_cast<List*>(env["$list"]);
-      Expression* v = ARG("$val", Expression);
-      if (CommaSequence_Selector* sl = dynamic_cast<CommaSequence_Selector*>(env["$list"])) {
-        Listize listize(ctx.mem);
-        l = dynamic_cast<List*>(sl->perform(&listize));
+      Map_Obj m = SASS_MEMORY_CAST(Map, env["$list"]);
+      List_Obj l = SASS_MEMORY_CAST(List, env["$list"]);
+      Expression_Obj v = ARG("$val", Expression);
+      if (Selector_List_Ptr sl = SASS_MEMORY_CAST(Selector_List, env["$list"])) {
+        Listize listize;
+        l = SASS_MEMORY_CAST_PTR(List, sl->perform(&listize));
       }
-      String_Constant* sep = ARG("$separator", String_Constant);
+      String_Constant_Obj sep = ARG("$separator", String_Constant);
       if (!l) {
-        l = SASS_MEMORY_NEW(ctx.mem, List, pstate, 1);
-        *l << ARG("$list", Expression);
+        l = SASS_MEMORY_NEW(List, pstate, 1);
+        l->append(ARG("$list", Expression));
       }
       if (m) {
         l = m->to_list(ctx, pstate);
       }
-      List* result = SASS_MEMORY_NEW(ctx.mem, List, pstate, l->length() + 1, l->separator());
+      List_Ptr result = SASS_MEMORY_COPY(l);
       std::string sep_str(unquote(sep->value()));
-      if (sep_str == "space") result->separator(SASS_SPACE);
-      else if (sep_str == "comma") result->separator(SASS_COMMA);
-      else if (sep_str != "auto") error("argument `$separator` of `" + std::string(sig) + "` must be `space`, `comma`, or `auto`", pstate);
-      *result += l;
-      bool is_arglist = l->is_arglist();
-      result->is_arglist(is_arglist);
-      if (is_arglist) {
-        *result << SASS_MEMORY_NEW(ctx.mem, Argument,
-                                   v->pstate(),
-                                   v,
-                                   "",
-                                   false,
-                                   false);
+      if (sep_str != "auto") { // check default first
+        if (sep_str == "space") result->separator(SASS_SPACE);
+        else if (sep_str == "comma") result->separator(SASS_COMMA);
+        else error("argument `$separator` of `" + std::string(sig) + "` must be `space`, `comma`, or `auto`", pstate);
+      }
+      if (l->is_arglist()) {
+        result->append(SASS_MEMORY_NEW(Argument,
+                                       v->pstate(),
+                                       v,
+                                       "",
+                                       false,
+                                       false));
 
       } else {
-        *result << v;
+        result->append(v);
       }
       return result;
     }
@@ -1420,34 +1402,35 @@ namespace Sass {
     Signature zip_sig = "zip($lists...)";
     BUILT_IN(zip)
     {
-      List* arglist = SASS_MEMORY_NEW(ctx.mem, List, *ARG("$lists", List));
+      List_Obj arglist = SASS_MEMORY_COPY(ARG("$lists", List));
       size_t shortest = 0;
       for (size_t i = 0, L = arglist->length(); i < L; ++i) {
-        List* ith = dynamic_cast<List*>(arglist->value_at_index(i));
-        Map* mith = dynamic_cast<Map*>(arglist->value_at_index(i));
+        List_Obj ith = SASS_MEMORY_CAST(List, arglist->value_at_index(i));
+        Map_Obj mith = SASS_MEMORY_CAST(Map, arglist->value_at_index(i));
         if (!ith) {
           if (mith) {
             ith = mith->to_list(ctx, pstate);
           } else {
-            ith = SASS_MEMORY_NEW(ctx.mem, List, pstate, 1);
-            *ith << arglist->value_at_index(i);
+            ith = SASS_MEMORY_NEW(List, pstate, 1);
+            ith->append(arglist->value_at_index(i));
           }
           if (arglist->is_arglist()) {
-            ((Argument*)(*arglist)[i])->value(ith);
+            Argument_Obj arg = (Argument_Ptr)(&arglist->at(i));
+            arg->value(&ith);
           } else {
-            (*arglist)[i] = ith;
+            (*arglist)[i] = &ith;
           }
         }
         shortest = (i ? std::min(shortest, ith->length()) : ith->length());
       }
-      List* zippers = SASS_MEMORY_NEW(ctx.mem, List, pstate, shortest, SASS_COMMA);
+      List_Ptr zippers = SASS_MEMORY_NEW(List, pstate, shortest, SASS_COMMA);
       size_t L = arglist->length();
       for (size_t i = 0; i < shortest; ++i) {
-        List* zipper = SASS_MEMORY_NEW(ctx.mem, List, pstate, L);
+        List_Ptr zipper = SASS_MEMORY_NEW(List, pstate, L);
         for (size_t j = 0; j < L; ++j) {
-          *zipper << (*static_cast<List*>(arglist->value_at_index(j)))[i];
+          zipper->append(SASS_MEMORY_CAST(List, arglist->value_at_index(j))->at(i));
         }
-        *zippers << zipper;
+        zippers->append(zipper);
       }
       return zippers;
     }
@@ -1455,12 +1438,12 @@ namespace Sass {
     Signature list_separator_sig = "list_separator($list)";
     BUILT_IN(list_separator)
     {
-      List* l = dynamic_cast<List*>(env["$list"]);
+      List_Obj l = SASS_MEMORY_CAST(List, env["$list"]);
       if (!l) {
-        l = SASS_MEMORY_NEW(ctx.mem, List, pstate, 1);
-        *l << ARG("$list", Expression);
+        l = SASS_MEMORY_NEW(List, pstate, 1);
+        l->append(ARG("$list", Expression));
       }
-      return SASS_MEMORY_NEW(ctx.mem, String_Quoted,
+      return SASS_MEMORY_NEW(String_Quoted,
                                pstate,
                                l->separator() == SASS_COMMA ? "comma" : "space");
     }
@@ -1472,12 +1455,15 @@ namespace Sass {
     Signature map_get_sig = "map-get($map, $key)";
     BUILT_IN(map_get)
     {
-      Map* m = ARGM("$map", Map, ctx);
-      Expression* v = ARG("$key", Expression);
+      // leaks for "map-get((), foo)" if not Obj
+      // investigate why this is (unexpected)
+      Map_Obj m = ARGM("$map", Map, ctx);
+      Expression_Obj v = ARG("$key", Expression);
       try {
-        return m->at(v);
+        Expression_Obj val = m->at(v); // XXX
+        return val ? val.detach() : SASS_MEMORY_NEW(Null, pstate);
       } catch (const std::out_of_range&) {
-        return SASS_MEMORY_NEW(ctx.mem, Null, pstate);
+        return SASS_MEMORY_NEW(Null, pstate);
       }
       catch (...) { throw; }
     }
@@ -1485,18 +1471,18 @@ namespace Sass {
     Signature map_has_key_sig = "map-has-key($map, $key)";
     BUILT_IN(map_has_key)
     {
-      Map* m = ARGM("$map", Map, ctx);
-      Expression* v = ARG("$key", Expression);
-      return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, m->has(v));
+      Map_Obj m = ARGM("$map", Map, ctx);
+      Expression_Obj v = ARG("$key", Expression);
+      return SASS_MEMORY_NEW(Boolean, pstate, m->has(v));
     }
 
     Signature map_keys_sig = "map-keys($map)";
     BUILT_IN(map_keys)
     {
-      Map* m = ARGM("$map", Map, ctx);
-      List* result = SASS_MEMORY_NEW(ctx.mem, List, pstate, m->length(), SASS_COMMA);
+      Map_Obj m = ARGM("$map", Map, ctx);
+      List_Ptr result = SASS_MEMORY_NEW(List, pstate, m->length(), SASS_COMMA);
       for ( auto key : m->keys()) {
-        *result << key;
+        result->append(key);
       }
       return result;
     }
@@ -1504,10 +1490,10 @@ namespace Sass {
     Signature map_values_sig = "map-values($map)";
     BUILT_IN(map_values)
     {
-      Map* m = ARGM("$map", Map, ctx);
-      List* result = SASS_MEMORY_NEW(ctx.mem, List, pstate, m->length(), SASS_COMMA);
+      Map_Obj m = ARGM("$map", Map, ctx);
+      List_Ptr result = SASS_MEMORY_NEW(List, pstate, m->length(), SASS_COMMA);
       for ( auto key : m->keys()) {
-        *result << m->at(key);
+        result->append(m->at(key));
       }
       return result;
     }
@@ -1515,13 +1501,14 @@ namespace Sass {
     Signature map_merge_sig = "map-merge($map1, $map2)";
     BUILT_IN(map_merge)
     {
-      Map* m1 = ARGM("$map1", Map, ctx);
-      Map* m2 = ARGM("$map2", Map, ctx);
+      Map_Obj m1 = ARGM("$map1", Map, ctx);
+      Map_Obj m2 = ARGM("$map2", Map, ctx);
 
       size_t len = m1->length() + m2->length();
-      Map* result = SASS_MEMORY_NEW(ctx.mem, Map, pstate, len);
-      *result += m1;
-      *result += m2;
+      Map_Ptr result = SASS_MEMORY_NEW(Map, pstate, len);
+      // concat not implemented for maps
+      *result += &m1;
+      *result += &m2;
       return result;
     }
 
@@ -1529,9 +1516,9 @@ namespace Sass {
     BUILT_IN(map_remove)
     {
       bool remove;
-      Map* m = ARGM("$map", Map, ctx);
-      List* arglist = ARG("$keys", List);
-      Map* result = SASS_MEMORY_NEW(ctx.mem, Map, pstate, 1);
+      Map_Obj m = ARGM("$map", Map, ctx);
+      List_Obj arglist = ARG("$keys", List);
+      Map_Ptr result = SASS_MEMORY_NEW(Map, pstate, 1);
       for (auto key : m->keys()) {
         remove = false;
         for (size_t j = 0, K = arglist->length(); j < K && !remove; ++j) {
@@ -1545,16 +1532,18 @@ namespace Sass {
     Signature keywords_sig = "keywords($args)";
     BUILT_IN(keywords)
     {
-      List* arglist = SASS_MEMORY_NEW(ctx.mem, List, *ARG("$args", List));
-      Map* result = SASS_MEMORY_NEW(ctx.mem, Map, pstate, 1);
+      List_Obj arglist = SASS_MEMORY_COPY(ARG("$args", List)); // copy
+      Map_Obj result = SASS_MEMORY_NEW(Map, pstate, 1);
       for (size_t i = arglist->size(), L = arglist->length(); i < L; ++i) {
-        std::string name = std::string(((Argument*)(*arglist)[i])->name());
+        Expression_Obj obj = arglist->at(i);
+        Argument_Obj arg = (Argument_Ptr)&obj;
+        std::string name = std::string(arg->name());
         name = name.erase(0, 1); // sanitize name (remove dollar sign)
-        *result << std::make_pair(SASS_MEMORY_NEW(ctx.mem, String_Quoted,
+        *result << std::make_pair(SASS_MEMORY_NEW(String_Quoted,
                  pstate, name),
-                 ((Argument*)(*arglist)[i])->value());
+                 arg->value());
       }
-      return result;
+      return result.detach();
     }
 
     //////////////////////////
@@ -1564,29 +1553,29 @@ namespace Sass {
     Signature type_of_sig = "type-of($value)";
     BUILT_IN(type_of)
     {
-      Expression* v = ARG("$value", Expression);
-      return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, v->type());
+      Expression_Ptr v = ARG("$value", Expression);
+      return SASS_MEMORY_NEW(String_Quoted, pstate, v->type());
     }
 
     Signature unit_sig = "unit($number)";
     BUILT_IN(unit)
-    { return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, quote(ARG("$number", Number)->unit(), '"')); }
+    { return SASS_MEMORY_NEW(String_Quoted, pstate, quote(ARG("$number", Number)->unit(), '"')); }
 
     Signature unitless_sig = "unitless($number)";
     BUILT_IN(unitless)
-    { return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, ARG("$number", Number)->is_unitless()); }
+    { return SASS_MEMORY_NEW(Boolean, pstate, ARG("$number", Number)->is_unitless()); }
 
     Signature comparable_sig = "comparable($number-1, $number-2)";
     BUILT_IN(comparable)
     {
-      Number* n1 = ARG("$number-1", Number);
-      Number* n2 = ARG("$number-2", Number);
+      Number_Ptr n1 = ARG("$number-1", Number);
+      Number_Ptr n2 = ARG("$number-2", Number);
       if (n1->is_unitless() || n2->is_unitless()) {
-        return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, true);
+        return SASS_MEMORY_NEW(Boolean, pstate, true);
       }
-      Number tmp_n2(*n2);
+      Number tmp_n2(n2); // copy
       tmp_n2.normalize(n1->find_convertible_unit());
-      return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, n1->unit() == tmp_n2.unit());
+      return SASS_MEMORY_NEW(Boolean, pstate, n1->unit() == tmp_n2.unit());
     }
 
     Signature variable_exists_sig = "variable-exists($name)";
@@ -1595,10 +1584,10 @@ namespace Sass {
       std::string s = Util::normalize_underscores(unquote(ARG("$name", String_Constant)->value()));
 
       if(d_env.has("$"+s)) {
-        return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, true);
+        return SASS_MEMORY_NEW(Boolean, pstate, true);
       }
       else {
-        return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, false);
+        return SASS_MEMORY_NEW(Boolean, pstate, false);
       }
     }
 
@@ -1608,10 +1597,10 @@ namespace Sass {
       std::string s = Util::normalize_underscores(unquote(ARG("$name", String_Constant)->value()));
 
       if(d_env.has_global("$"+s)) {
-        return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, true);
+        return SASS_MEMORY_NEW(Boolean, pstate, true);
       }
       else {
-        return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, false);
+        return SASS_MEMORY_NEW(Boolean, pstate, false);
       }
     }
 
@@ -1621,10 +1610,10 @@ namespace Sass {
       std::string s = Util::normalize_underscores(unquote(ARG("$name", String_Constant)->value()));
 
       if(d_env.has_global(s+"[f]")) {
-        return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, true);
+        return SASS_MEMORY_NEW(Boolean, pstate, true);
       }
       else {
-        return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, false);
+        return SASS_MEMORY_NEW(Boolean, pstate, false);
       }
     }
 
@@ -1634,10 +1623,10 @@ namespace Sass {
       std::string s = Util::normalize_underscores(unquote(ARG("$name", String_Constant)->value()));
 
       if(d_env.has_global(s+"[m]")) {
-        return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, true);
+        return SASS_MEMORY_NEW(Boolean, pstate, true);
       }
       else {
-        return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, false);
+        return SASS_MEMORY_NEW(Boolean, pstate, false);
       }
     }
 
@@ -1647,10 +1636,10 @@ namespace Sass {
       std::string s = unquote(ARG("$name", String_Constant)->value());
 
       if(features.find(s) == features.end()) {
-        return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, false);
+        return SASS_MEMORY_NEW(Boolean, pstate, false);
       }
       else {
-        return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, true);
+        return SASS_MEMORY_NEW(Boolean, pstate, true);
       }
     }
 
@@ -1658,34 +1647,36 @@ namespace Sass {
     BUILT_IN(call)
     {
       std::string name = Util::normalize_underscores(unquote(ARG("$name", String_Constant)->value()));
-      List* arglist = SASS_MEMORY_NEW(ctx.mem, List, *ARG("$args", List));
+      List_Obj arglist = SASS_MEMORY_COPY(ARG("$args", List));
 
-      Arguments* args = SASS_MEMORY_NEW(ctx.mem, Arguments, pstate);
+      Arguments_Obj args = SASS_MEMORY_NEW(Arguments, pstate);
       // std::string full_name(name + "[f]");
-      // Definition* def = d_env.has(full_name) ? static_cast<Definition*>((d_env)[full_name]) : 0;
-      // Parameters* params = def ? def->parameters() : 0;
+      // Definition_Ptr def = d_env.has(full_name) ? static_cast<Definition_Ptr>((d_env)[full_name]) : 0;
+      // Parameters_Ptr params = def ? def->parameters() : 0;
       // size_t param_size = params ? params->length() : 0;
       for (size_t i = 0, L = arglist->length(); i < L; ++i) {
-        Expression* expr = arglist->value_at_index(i);
+        Expression_Obj expr = arglist->value_at_index(i);
         // if (params && params->has_rest_parameter()) {
-        //   Parameter* p = param_size > i ? (*params)[i] : 0;
-        //   List* list = dynamic_cast<List*>(expr);
+        //   Parameter_Obj p = param_size > i ? (*params)[i] : 0;
+        //   List_Ptr list = SASS_MEMORY_CAST(List, expr);
         //   if (list && p && !p->is_rest_parameter()) expr = (*list)[0];
         // }
         if (arglist->is_arglist()) {
-          Argument* arg = dynamic_cast<Argument*>((*arglist)[i]);
-          *args << SASS_MEMORY_NEW(ctx.mem, Argument,
-                                   pstate,
-                                   expr,
-                                   arg ? arg->name() : "",
-                                   arg ? arg->is_rest_argument() : false,
-                                   arg ? arg->is_keyword_argument() : false);
+          Expression_Obj obj = arglist->at(i);
+          Argument_Obj arg = (Argument_Ptr)&obj;
+          args->append(SASS_MEMORY_NEW(Argument,
+                                       pstate,
+                                       expr,
+                                       arg ? arg->name() : "",
+                                       arg ? arg->is_rest_argument() : false,
+                                       arg ? arg->is_keyword_argument() : false));
         } else {
-          *args << SASS_MEMORY_NEW(ctx.mem, Argument, pstate, expr);
+          args->append(SASS_MEMORY_NEW(Argument, pstate, expr));
         }
       }
-      Function_Call* func = SASS_MEMORY_NEW(ctx.mem, Function_Call, pstate, name, args);
+      Function_Call_Obj func = SASS_MEMORY_NEW(Function_Call, pstate, name, &args);
       Expand expand(ctx, &d_env, backtrace, &selector_stack);
+      func->via_call(true); // calc invoke is allowed
       return func->perform(&expand.eval);
 
     }
@@ -1696,7 +1687,9 @@ namespace Sass {
 
     Signature not_sig = "not($value)";
     BUILT_IN(sass_not)
-    { return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, ARG("$value", Expression)->is_false()); }
+    {
+      return SASS_MEMORY_NEW(Boolean, pstate, ARG("$value", Expression)->is_false());
+    }
 
     Signature if_sig = "if($condition, $if-true, $if-false)";
     // BUILT_IN(sass_if)
@@ -1704,8 +1697,9 @@ namespace Sass {
     BUILT_IN(sass_if)
     {
       Expand expand(ctx, &d_env, backtrace, &selector_stack);
-      bool is_true = !ARG("$condition", Expression)->perform(&expand.eval)->is_false();
-      Expression* res = ARG(is_true ? "$if-true" : "$if-false", Expression);
+      Expression_Obj cond = ARG("$condition", Expression)->perform(&expand.eval);
+      bool is_true = !cond->is_false();
+      Expression_Ptr res = ARG(is_true ? "$if-true" : "$if-false", Expression);
       res = res->perform(&expand.eval);
       res->set_delayed(false); // clone?
       return res;
@@ -1732,11 +1726,11 @@ namespace Sass {
     Signature inspect_sig = "inspect($value)";
     BUILT_IN(inspect)
     {
-      Expression* v = ARG("$value", Expression);
+      Expression_Ptr v = ARG("$value", Expression);
       if (v->concrete_type() == Expression::NULL_VAL) {
-        return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, "null");
-      } else if (v->concrete_type() == Expression::BOOLEAN && *v == 0) {
-        return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, "false");
+        return SASS_MEMORY_NEW(String_Quoted, pstate, "null");
+      } else if (v->concrete_type() == Expression::BOOLEAN && v->is_false()) {
+        return SASS_MEMORY_NEW(String_Quoted, pstate, "false");
       } else if (v->concrete_type() == Expression::STRING) {
         return v;
       } else {
@@ -1749,101 +1743,103 @@ namespace Sass {
         i.in_declaration = false;
         v->perform(&i);
         ctx.c_options.output_style = old_style;
-        return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, i.get_buffer());
+        return SASS_MEMORY_NEW(String_Quoted, pstate, i.get_buffer());
       }
       // return v;
     }
     Signature selector_nest_sig = "selector-nest($selectors...)";
     BUILT_IN(selector_nest)
     {
-      List* arglist = ARG("$selectors", List);
+      List_Ptr arglist = ARG("$selectors", List);
 
       // Not enough parameters
       if( arglist->length() == 0 )
-        error("$selectors: At least one selector must be passed", pstate);
+        error("$selectors: At least one selector must be passed for `selector-nest'", pstate);
 
       // Parse args into vector of selectors
-      std::vector<CommaSequence_Selector*> parsedSelectors;
+      std::vector<Selector_List_Obj> parsedSelectors;
       for (size_t i = 0, L = arglist->length(); i < L; ++i) {
-        Expression* exp = dynamic_cast<Expression*>(arglist->value_at_index(i));
+        Expression_Obj exp = SASS_MEMORY_CAST(Expression, arglist->value_at_index(i));
         if (exp->concrete_type() == Expression::NULL_VAL) {
           std::stringstream msg;
           msg << "$selectors: null is not a valid selector: it must be a string,\n";
           msg << "a list of strings, or a list of lists of strings for 'selector-nest'";
           error(msg.str(), pstate);
         }
-        if (String_Constant* str =dynamic_cast<String_Constant*>(exp)) {
+        if (String_Constant_Obj str = SASS_MEMORY_CAST(String_Constant, exp)) {
           str->quote_mark(0);
         }
         std::string exp_src = exp->to_string(ctx.c_options) + "{";
-        CommaSequence_Selector* sel = Parser::parse_selector(exp_src.c_str(), ctx);
-        parsedSelectors.push_back(sel);
+        Selector_List_Obj sel = Parser::parse_selector(exp_src.c_str(), ctx);
+        parsedSelectors.push_back(&sel);
       }
 
       // Nothing to do
       if( parsedSelectors.empty() ) {
-        return SASS_MEMORY_NEW(ctx.mem, Null, pstate);
+        return SASS_MEMORY_NEW(Null, pstate);
       }
 
       // Set the first element as the `result`, keep appending to as we go down the parsedSelector vector.
-      std::vector<CommaSequence_Selector*>::iterator itr = parsedSelectors.begin();
-      CommaSequence_Selector* result = *itr;
+      std::vector<Selector_List_Obj>::iterator itr = parsedSelectors.begin();
+      Selector_List_Obj result = *itr;
       ++itr;
 
       for(;itr != parsedSelectors.end(); ++itr) {
-        CommaSequence_Selector* child = *itr;
-        std::vector<Sequence_Selector*> exploded;
-        CommaSequence_Selector* rv = child->resolve_parent_refs(ctx, result);
+        Selector_List_Obj child = *itr;
+        std::vector<Complex_Selector_Obj> exploded;
+        selector_stack.push_back(&result);
+        Selector_List_Obj rv = child->resolve_parent_refs(ctx, selector_stack);
+        selector_stack.pop_back();
         for (size_t m = 0, mLen = rv->length(); m < mLen; ++m) {
           exploded.push_back((*rv)[m]);
         }
         result->elements(exploded);
       }
 
-      Listize listize(ctx.mem);
+      Listize listize;
       return result->perform(&listize);
     }
 
     Signature selector_append_sig = "selector-append($selectors...)";
     BUILT_IN(selector_append)
     {
-      List* arglist = ARG("$selectors", List);
+      List_Ptr arglist = ARG("$selectors", List);
 
       // Not enough parameters
       if( arglist->length() == 0 )
-        error("$selectors: At least one selector must be passed", pstate);
+        error("$selectors: At least one selector must be passed for `selector-append'", pstate);
 
       // Parse args into vector of selectors
-      std::vector<CommaSequence_Selector*> parsedSelectors;
+      std::vector<Selector_List_Obj> parsedSelectors;
       for (size_t i = 0, L = arglist->length(); i < L; ++i) {
-        Expression* exp = dynamic_cast<Expression*>(arglist->value_at_index(i));
+        Expression_Obj exp = SASS_MEMORY_CAST(Expression, arglist->value_at_index(i));
         if (exp->concrete_type() == Expression::NULL_VAL) {
           std::stringstream msg;
           msg << "$selectors: null is not a valid selector: it must be a string,\n";
           msg << "a list of strings, or a list of lists of strings for 'selector-append'";
           error(msg.str(), pstate);
         }
-        if (String_Constant* str =dynamic_cast<String_Constant*>(exp)) {
+        if (String_Constant_Ptr str = SASS_MEMORY_CAST(String_Constant, exp)) {
           str->quote_mark(0);
         }
         std::string exp_src = exp->to_string() + "{";
-        CommaSequence_Selector* sel = Parser::parse_selector(exp_src.c_str(), ctx);
-        parsedSelectors.push_back(sel);
+        Selector_List_Obj sel = Parser::parse_selector(exp_src.c_str(), ctx);
+        parsedSelectors.push_back(&sel);
       }
 
       // Nothing to do
       if( parsedSelectors.empty() ) {
-        return SASS_MEMORY_NEW(ctx.mem, Null, pstate);
+        return SASS_MEMORY_NEW(Null, pstate);
       }
 
       // Set the first element as the `result`, keep appending to as we go down the parsedSelector vector.
-      std::vector<CommaSequence_Selector*>::iterator itr = parsedSelectors.begin();
-      CommaSequence_Selector* result = *itr;
+      std::vector<Selector_List_Obj>::iterator itr = parsedSelectors.begin();
+      Selector_List_Obj result = *itr;
       ++itr;
 
       for(;itr != parsedSelectors.end(); ++itr) {
-        CommaSequence_Selector* child = *itr;
-        std::vector<Sequence_Selector*> newElements;
+        Selector_List_Obj child = *itr;
+        std::vector<Complex_Selector_Obj> newElements;
 
         // For every COMPLEX_SELECTOR in `result`
         // For every COMPLEX_SELECTOR in `child`
@@ -1854,73 +1850,73 @@ namespace Sass {
         // Replace result->elements with newElements
         for (size_t i = 0, resultLen = result->length(); i < resultLen; ++i) {
           for (size_t j = 0, childLen = child->length(); j < childLen; ++j) {
-            Sequence_Selector* parentSeqClone = (*result)[i]->cloneFully(ctx);
-            Sequence_Selector* childSeq = (*child)[j];
-            Sequence_Selector* base = childSeq->tail();
+            Complex_Selector_Obj parentSeqClone = SASS_MEMORY_CLONE((*result)[i]);
+            Complex_Selector_Obj childSeq = (*child)[j];
+            Complex_Selector_Obj base = childSeq->tail();
 
             // Must be a simple sequence
-            if( childSeq->combinator() != Sequence_Selector::Combinator::ANCESTOR_OF ) {
-              std::string msg("Can't append  `");
+            if( childSeq->combinator() != Complex_Selector::Combinator::ANCESTOR_OF ) {
+              std::string msg("Can't append \"");
               msg += childSeq->to_string();
-              msg += "` to `";
+              msg += "\" to \"";
               msg += parentSeqClone->to_string();
-              msg += "`";
+              msg += "\" for `selector-append'";
               error(msg, pstate, backtrace);
             }
 
             // Cannot be a Universal selector
-            Element_Selector* pType = dynamic_cast<Element_Selector*>(childSeq->head()->first());
+            Element_Selector_Obj pType = SASS_MEMORY_CAST(Element_Selector, childSeq->head()->first());
             if(pType && pType->name() == "*") {
-              std::string msg("Can't append  `");
+              std::string msg("Can't append \"");
               msg += childSeq->to_string();
-              msg += "` to `";
+              msg += "\" to \"";
               msg += parentSeqClone->to_string();
-              msg += "`";
+              msg += "\" for `selector-append'";
               error(msg, pstate, backtrace);
             }
 
             // TODO: Add check for namespace stuff
 
             // append any selectors in childSeq's head
-            *(parentSeqClone->innermost()->head()) += (base->head());
+            parentSeqClone->innermost()->head()->concat(&base->head());
 
             // Set parentSeqClone new tail
             parentSeqClone->innermost()->tail( base->tail() );
 
-            newElements.push_back(parentSeqClone);
+            newElements.push_back(&parentSeqClone);
           }
         }
 
         result->elements(newElements);
       }
 
-      Listize listize(ctx.mem);
+      Listize listize;
       return result->perform(&listize);
     }
 
     Signature selector_unify_sig = "selector-unify($selector1, $selector2)";
     BUILT_IN(selector_unify)
     {
-      CommaSequence_Selector* selector1 = ARGSEL("$selector1", CommaSequence_Selector, p_contextualize);
-      CommaSequence_Selector* selector2 = ARGSEL("$selector2", CommaSequence_Selector, p_contextualize);
+      Selector_List_Obj selector1 = ARGSEL("$selector1", Selector_List_Obj, p_contextualize);
+      Selector_List_Obj selector2 = ARGSEL("$selector2", Selector_List_Obj, p_contextualize);
 
-      CommaSequence_Selector* result = selector1->unify_with(selector2, ctx);
-      Listize listize(ctx.mem);
+      Selector_List_Obj result = selector1->unify_with(&selector2, ctx);
+      Listize listize;
       return result->perform(&listize);
     }
 
     Signature simple_selectors_sig = "simple-selectors($selector)";
     BUILT_IN(simple_selectors)
     {
-      SimpleSequence_Selector* sel = ARGSEL("$selector", SimpleSequence_Selector, p_contextualize);
+      Compound_Selector_Obj sel = ARGSEL("$selector", Compound_Selector_Obj, p_contextualize);
 
-      List* l = SASS_MEMORY_NEW(ctx.mem, List, sel->pstate(), sel->length(), SASS_COMMA);
+      List_Ptr l = SASS_MEMORY_NEW(List, sel->pstate(), sel->length(), SASS_COMMA);
 
       for (size_t i = 0, L = sel->length(); i < L; ++i) {
-        Simple_Selector* ss = (*sel)[i];
+        Simple_Selector_Obj ss = (*sel)[i];
         std::string ss_string = ss->to_string() ;
 
-        *l << SASS_MEMORY_NEW(ctx.mem, String_Quoted, ss->pstate(), ss_string);
+        l->append(SASS_MEMORY_NEW(String_Quoted, ss->pstate(), ss_string));
       }
 
       return l;
@@ -1929,51 +1925,50 @@ namespace Sass {
     Signature selector_extend_sig = "selector-extend($selector, $extendee, $extender)";
     BUILT_IN(selector_extend)
     {
-      CommaSequence_Selector*  selector = ARGSEL("$selector", CommaSequence_Selector, p_contextualize);
-      CommaSequence_Selector*  extendee = ARGSEL("$extendee", CommaSequence_Selector, p_contextualize);
-      CommaSequence_Selector*  extender = ARGSEL("$extender", CommaSequence_Selector, p_contextualize);
+      Selector_List_Obj  selector = ARGSEL("$selector", Selector_List_Obj, p_contextualize);
+      Selector_List_Obj  extendee = ARGSEL("$extendee", Selector_List_Obj, p_contextualize);
+      Selector_List_Obj  extender = ARGSEL("$extender", Selector_List_Obj, p_contextualize);
 
-      ExtensionSubsetMap subset_map;
+      Subset_Map subset_map;
       extender->populate_extends(extendee, ctx, subset_map);
 
-      CommaSequence_Selector* result = Extend::extendSelectorList(selector, ctx, subset_map, false);
+      Selector_List_Obj result = Extend::extendSelectorList(selector, ctx, subset_map, false);
 
-      Listize listize(ctx.mem);
+      Listize listize;
       return result->perform(&listize);
     }
 
     Signature selector_replace_sig = "selector-replace($selector, $original, $replacement)";
     BUILT_IN(selector_replace)
     {
-      CommaSequence_Selector*  selector = ARGSEL("$selector", CommaSequence_Selector, p_contextualize);
-      CommaSequence_Selector*  original = ARGSEL("$original", CommaSequence_Selector, p_contextualize);
-      CommaSequence_Selector*  replacement = ARGSEL("$replacement", CommaSequence_Selector, p_contextualize);
-
-      ExtensionSubsetMap subset_map;
+      Selector_List_Obj selector = ARGSEL("$selector", Selector_List_Obj, p_contextualize);
+      Selector_List_Obj original = ARGSEL("$original", Selector_List_Obj, p_contextualize);
+      Selector_List_Obj replacement = ARGSEL("$replacement", Selector_List_Obj, p_contextualize);
+      Subset_Map subset_map;
       replacement->populate_extends(original, ctx, subset_map);
 
-      CommaSequence_Selector* result = Extend::extendSelectorList(selector, ctx, subset_map, true);
+      Selector_List_Obj result = Extend::extendSelectorList(selector, ctx, subset_map, true);
 
-      Listize listize(ctx.mem);
+      Listize listize;
       return result->perform(&listize);
     }
 
     Signature selector_parse_sig = "selector-parse($selector)";
     BUILT_IN(selector_parse)
     {
-      CommaSequence_Selector* sel = ARGSEL("$selector", CommaSequence_Selector, p_contextualize);
+      Selector_List_Obj sel = ARGSEL("$selector", Selector_List_Obj, p_contextualize);
 
-      Listize listize(ctx.mem);
+      Listize listize;
       return sel->perform(&listize);
     }
 
     Signature is_superselector_sig = "is-superselector($super, $sub)";
     BUILT_IN(is_superselector)
     {
-      CommaSequence_Selector*  sel_sup = ARGSEL("$super", CommaSequence_Selector, p_contextualize);
-      CommaSequence_Selector*  sel_sub = ARGSEL("$sub", CommaSequence_Selector, p_contextualize);
+      Selector_List_Obj  sel_sup = ARGSEL("$super", Selector_List_Obj, p_contextualize);
+      Selector_List_Obj  sel_sub = ARGSEL("$sub", Selector_List_Obj, p_contextualize);
       bool result = sel_sup->is_superselector_of(sel_sub);
-      return SASS_MEMORY_NEW(ctx.mem, Boolean, pstate, result);
+      return SASS_MEMORY_NEW(Boolean, pstate, result);
     }
 
     Signature unique_id_sig = "unique-id()";
@@ -1983,7 +1978,7 @@ namespace Sass {
       std::uniform_real_distribution<> distributor(0, 4294967296); // 16^8
       uint_fast32_t distributed = static_cast<uint_fast32_t>(distributor(rand));
       ss << "u" << std::setfill('0') << std::setw(8) << std::hex << distributed;
-      return SASS_MEMORY_NEW(ctx.mem, String_Quoted, pstate, ss.str());
+      return SASS_MEMORY_NEW(String_Quoted, pstate, ss.str());
     }
 
   }