Index: src/SynTree/Expression.cc
===================================================================
--- src/SynTree/Expression.cc	(revision 71a3593146d24665b26d962ad83af645b8cb9505)
+++ src/SynTree/Expression.cc	(revision d9e2280190814b3889003b217e8c205b8bbc67a2)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug  3 17:06:51 2016
-// Update Count     : 45
+// Last Modified On : Fri Aug  5 14:23:56 2016
+// Update Count     : 49
 //
 
@@ -529,5 +529,5 @@
 }
 
-RangeExpr::RangeExpr( ConstantExpr *low, ConstantExpr *high ) : low( low ), high( high ) {}
+RangeExpr::RangeExpr( Expression *low, Expression *high ) : low( low ), high( high ) {}
 RangeExpr::RangeExpr( const RangeExpr &other ) : low( other.low->clone() ), high( other.high->clone() ) {}
 void RangeExpr::print( std::ostream &os, int indent ) const {
Index: src/SynTree/Expression.h
===================================================================
--- src/SynTree/Expression.h	(revision 71a3593146d24665b26d962ad83af645b8cb9505)
+++ src/SynTree/Expression.h	(revision d9e2280190814b3889003b217e8c205b8bbc67a2)
@@ -10,6 +10,6 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug  5 10:26:07 2016
-// Update Count     : 28
+// Last Modified On : Fri Aug  5 14:23:58 2016
+// Update Count     : 32
 //
 
@@ -637,11 +637,11 @@
 class RangeExpr : public Expression {
   public:
-	RangeExpr( ConstantExpr *low, ConstantExpr *high );
+	RangeExpr( Expression *low, Expression *high );
 	RangeExpr( const RangeExpr &other );
 
-	ConstantExpr * get_low() const { return low.get(); }
-	ConstantExpr * get_high() const { return high.get(); }
-	RangeExpr * set_low( ConstantExpr *low ) { RangeExpr::low.reset( low ); return this; }
-	RangeExpr * set_high( ConstantExpr *high ) { RangeExpr::high.reset( high ); return this; }
+	Expression * get_low() const { return low; }
+	Expression * get_high() const { return high; }
+	RangeExpr * set_low( Expression *low ) { RangeExpr::low = low; return this; }
+	RangeExpr * set_high( Expression *high ) { RangeExpr::high = high; return this; }
 
 	virtual RangeExpr *clone() const { return new RangeExpr( *this ); }
@@ -650,5 +650,5 @@
 	virtual void print( std::ostream &os, int indent = 0 ) const;
   private:
-	std::unique_ptr<ConstantExpr> low, high;
+	Expression *low, *high;
 };