diff --git a/src/lib/Expr.cpp b/src/lib/Expr.cpp
index b9bda87..6407d24 100644
--- a/src/lib/Expr.cpp
+++ b/src/lib/Expr.cpp
@@ -72,7 +72,7 @@ Expr* Expr::makeColumnRef(char* name) {
 }
 
 Expr* Expr::makeColumnRef(char* table, char* name) {
-	Expr* e = new Expr(kExprTableColumnRef);
+	Expr* e = new Expr(kExprColumnRef);
 	e->name = name;
 	e->table = table;
 	return e;
diff --git a/src/lib/Expr.h b/src/lib/Expr.h
index 5ab054d..7673bf3 100644
--- a/src/lib/Expr.h
+++ b/src/lib/Expr.h
@@ -17,7 +17,6 @@ typedef enum {
 	kExprLiteralInt,
 	kExprStar,
 	kExprColumnRef,
-	kExprTableColumnRef,
 	kExprFunctionRef,
 	kExprOperator
 } ExprType;
@@ -79,7 +78,9 @@ struct Expr {
 	/**
 	 * Convenience accessor methods
 	 */
+	inline bool isType(ExprType e_type) { return e_type == type; }
 	inline bool hasAlias() { return alias != NULL; }
+	inline bool hasTable() { return table != NULL; }
 	inline char* getName() {
 		if (alias != NULL) return alias;
 		else return name;
diff --git a/src/lib/sqlhelper.cpp b/src/lib/sqlhelper.cpp
index a5afeb9..9b22100 100644
--- a/src/lib/sqlhelper.cpp
+++ b/src/lib/sqlhelper.cpp
@@ -61,7 +61,7 @@ void printExpression(Expr* expr, uint num_indent) {
   switch (expr->type) {
     case kExprStar: inprint("*", num_indent); break;
     case kExprColumnRef: inprint(expr->name, num_indent); break;
-    case kExprTableColumnRef: inprint(expr->table, expr->name, num_indent); break;
+    // case kExprTableColumnRef: inprint(expr->table, expr->name, num_indent); break;
     case kExprLiteralFloat: inprint(expr->fval, num_indent); break;
     case kExprLiteralInt: inprint(expr->ival, num_indent); break;
     case kExprLiteralString: inprint(expr->name, num_indent); break;