diff --git a/libserpent/compiler.cpp b/libserpent/compiler.cpp
index 886eee6df..d19ef4354 100644
--- a/libserpent/compiler.cpp
+++ b/libserpent/compiler.cpp
@@ -77,43 +77,12 @@ Node popwrap(Node node) {
     return multiToken(nodelist, 2, node.metadata);
 }
 
-// Grabs variables
-mss getVariables(Node node, mss cur=mss()) {
-    Metadata m = node.metadata;
-    // Tokens don't contain any variables
-    if (node.type == TOKEN)
-        return cur;
-    // Don't descend into call fragments
-    else if (node.val == "lll")
-        return getVariables(node.args[1], cur);
-    // At global scope get/set/ref also declare    
-    else if (node.val == "get" || node.val == "set" || node.val == "ref") {
-        if (node.args[0].type != TOKEN)
-            err("Variable name must be simple token,"
-                " not complex expression! " + printSimple(node.args[0]), m);
-        if (!cur.count(node.args[0].val)) {
-            cur[node.args[0].val] = utd(cur.size() * 32 + 32);
-            //std::cerr << node.args[0].val << " " << cur[node.args[0].val] << "\n";
-        }
-    }
-    // Recursively process children
-    for (unsigned i = 0; i < node.args.size(); i++) {
-        cur = getVariables(node.args[i], cur);
-    }
-    return cur;
-}
-
 // Turns LLL tree into tree of code fragments
 programData opcodeify(Node node,
                       programAux aux=Aux(),
                       programVerticalAux vaux=verticalAux()) {
     std::string symb = "_"+mkUniqueToken();
     Metadata m = node.metadata;
-    // Get variables
-    if (!aux.vars.size()) {
-        aux.vars = getVariables(node);
-        aux.nextVarMem = aux.vars.size() * 32 + 32;
-    }
     // Numbers
     if (node.type == TOKEN) {
         return pd(aux, nodeToNumeric(node), 1);
@@ -121,6 +90,10 @@ programData opcodeify(Node node,
     else if (node.val == "ref" || node.val == "get" || node.val == "set") {
         std::string varname = node.args[0].val;
         // Determine reference to variable
+        if (!aux.vars.count(node.args[0].val)) {
+            aux.vars[node.args[0].val] = utd(aux.nextVarMem);
+            aux.nextVarMem += 32;
+        }
         Node varNode = tkn(aux.vars[varname], m);
         //std::cerr << varname << " " << printSimple(varNode) << "\n";
         // Set variable
@@ -173,8 +146,7 @@ programData opcodeify(Node node,
     }
     // Comments do nothing
     else if (node.val == "comment") {
-        Node* nodelist = nullptr;
-        return pd(aux, multiToken(nodelist, 0, m), 0);
+        return pd(aux, astnode("_", m), 0);
     }
     // Custom operation sequence
     // eg. (ops bytez id msize swap1 msize add 0 swap1 mstore) == alloc
@@ -371,7 +343,7 @@ Node buildFragmentTree(Node node) {
 
 
 // Builds a dictionary mapping labels to variable names
-programAux buildDict(Node program, programAux aux, int labelLength) {
+void buildDict(Node program, programAux &aux, int labelLength) {
     Metadata m = program.metadata;
     // Token
     if (program.type == TOKEN) {
@@ -388,30 +360,24 @@ programAux buildDict(Node program, programAux aux, int labelLength) {
     }
     // A sub-program (ie. LLL)
     else if (program.val == "____CODE") {
-        programAux auks = Aux();
+        int step = aux.step;
+        aux.step = 0;
         for (unsigned i = 0; i < program.args.size(); i++) {
-            auks = buildDict(program.args[i], auks, labelLength);
+            buildDict(program.args[i], aux, labelLength);
         }
-        for (std::map<std::string,std::string>::iterator it=auks.vars.begin();
-             it != auks.vars.end();
-             it++) {
-            aux.vars[(*it).first] = (*it).second;
-        }
-        aux.step += auks.step;
+        aux.step += step;
     }
     // Normal sub-block
     else {
         for (unsigned i = 0; i < program.args.size(); i++) {
-            aux = buildDict(program.args[i], aux, labelLength);
+            buildDict(program.args[i], aux, labelLength);
         }
     }
-    return aux;
 }
 
 // Applies that dictionary
-Node substDict(Node program, programAux aux, int labelLength) {
+void substDict(Node program, programAux aux, int labelLength, std::vector<Node> &out) {
     Metadata m = program.metadata;
-    std::vector<Node> out;
     std::vector<Node> inner;
     if (program.type == TOKEN) {
         if (program.val[0] == '$') {
@@ -428,46 +394,32 @@ Node substDict(Node program, programAux aux, int labelLength) {
                             dist = decimalSub(end, start);
                 inner = toByteArr(dist, m, labelLength);
             }
-            out.push_back(astnode("_", inner, m));
+            for (unsigned i = 0; i < inner.size(); i++) out.push_back(inner[i]);
         }
         else if (program.val[0] == '~') { }
         else if (isNumberLike(program)) {
             inner = toByteArr(program.val, m);
             out.push_back(token("PUSH"+unsignedToDecimal(inner.size())));
-            out.push_back(astnode("_", inner, m));
+            for (unsigned i = 0; i < inner.size(); i++) out.push_back(inner[i]);
         }
-        else return program;
+        else  out.push_back(program);
     }
     else {
         for (unsigned i = 0; i < program.args.size(); i++) {
-            Node n = substDict(program.args[i], aux, labelLength);
-            if (n.type == TOKEN || n.args.size()) out.push_back(n);
+            substDict(program.args[i], aux, labelLength, out);
         }
     }
-    return astnode("_", out, m);
 }
 
 // Compiled fragtree -> compiled fragtree without labels
-Node dereference(Node program) {
+std::vector<Node> dereference(Node program) {
     int sz = treeSize(program) * 4;
     int labelLength = 1;
     while (sz >= 256) { labelLength += 1; sz /= 256; }
-    programAux aux = buildDict(program, Aux(), labelLength);
-    return substDict(program, aux, labelLength);
-}
-
-// Dereferenced fragtree -> opcodes
-std::vector<Node> flatten(Node derefed) {
+    programAux aux = Aux();
+    buildDict(program, aux, labelLength);
     std::vector<Node> o;
-    if (derefed.type == TOKEN) {
-        o.push_back(derefed);
-    }
-    else {
-        for (unsigned i = 0; i < derefed.args.size(); i++) {
-            std::vector<Node> oprime = flatten(derefed.args[i]);
-            for (unsigned j = 0; j < oprime.size(); j++) o.push_back(oprime[j]);
-        }
-    }
+    substDict(program, aux, labelLength, o);
     return o;
 }
 
@@ -512,12 +464,12 @@ std::vector<Node> deserialize(std::string ser) {
 
 // Fragtree -> bin
 std::string assemble(Node fragTree) {
-    return serialize(flatten(dereference(fragTree)));
+    return serialize(dereference(fragTree));
 }
 
 // Fragtree -> tokens
 std::vector<Node> prettyAssemble(Node fragTree) {
-    return flatten(dereference(fragTree));
+    return dereference(fragTree);
 }
 
 // LLL -> bin
diff --git a/libserpent/compiler.h b/libserpent/compiler.h
index aecaa3718..cae87399d 100644
--- a/libserpent/compiler.h
+++ b/libserpent/compiler.h
@@ -8,14 +8,11 @@
 #include "util.h"
 
 // Compiled fragtree -> compiled fragtree without labels
-Node dereference(Node program);
+std::vector<Node> dereference(Node program);
 
 // LLL -> fragtree
 Node buildFragmentTree(Node program);
 
-// Dereferenced fragtree -> opcodes
-std::vector<Node> flatten(Node derefed);
-
 // opcodes -> bin
 std::string serialize(std::vector<Node> codons);
 
diff --git a/libserpent/util.cpp b/libserpent/util.cpp
index 18a8bafc2..5e83c0e41 100755
--- a/libserpent/util.cpp
+++ b/libserpent/util.cpp
@@ -5,7 +5,6 @@
 #include "util.h"
 #include "bignum.h"
 #include <fstream>
-#include <string>
 #include <cerrno>
 
 //Token or value node constructor
@@ -260,7 +259,7 @@ std::string get_file_contents(std::string filename)
   {
     std::string contents;
     in.seekg(0, std::ios::end);
-    contents.resize((unsigned)in.tellg());
+    contents.resize(in.tellg());
     in.seekg(0, std::ios::beg);
     in.read(&contents[0], contents.size());
     in.close();
diff --git a/pullSerpent.sh b/pullSerpent.sh
index c159e3075..5f8bed05d 100755
--- a/pullSerpent.sh
+++ b/pullSerpent.sh
@@ -2,10 +2,11 @@
 
 opwd="$PWD"
 cd ../serpent
+git stash
 git pull
+git stash pop
 cp bignum.* compiler.* funcs.* lllparser.* opcodes.h parser.* rewriter.* tokenize.* util.* ../cpp-ethereum/libserpent/
 cp cmdline.* "$opwd/sc/"
-cp pyserpent.* "$opwd/libpyserpent/"
 cd "$opwd"
-perl -i -p -e 's:include "funcs.h":include <libserpent/funcs.h>:gc' sc/* libpyserpent/*
+perl -i -p -e 's:include "funcs.h":include <libserpent/funcs.h>:gc' sc/*
 
diff --git a/sc/cmdline.cpp b/sc/cmdline.cpp
index a5fed37d6..04cdeaaf3 100644
--- a/sc/cmdline.cpp
+++ b/sc/cmdline.cpp
@@ -68,7 +68,7 @@ int main(int argv, char** argc) {
         std::cout << binToHex(compileLLL(parseLLL(input, true))) << "\n";
     }
     else if (command == "dereference") {
-        std::cout << printAST(dereference(parseLLL(input, true)), haveSec) <<"\n";
+        std::cout << printTokens(dereference(parseLLL(input, true))) <<"\n";
     }
     else if (command == "pretty_assemble") {
         std::cout << printTokens(prettyAssemble(parseLLL(input, true))) <<"\n";
@@ -88,9 +88,6 @@ int main(int argv, char** argc) {
     else if (command == "serialize") {
         std::cout << binToHex(serialize(tokenize(input, Metadata(), false))) << "\n";
     }
-    else if (command == "flatten") {
-        std::cout << printTokens(flatten(parseLLL(input, true))) << "\n";
-    }
     else if (command == "deserialize") {
         std::cout << printTokens(deserialize(hexToBin(input))) << "\n";
     }