Clean up code issues highlighted in review

ecl/hql/hqlexpr.cpp

@@ -539,9 +539,7 @@ extern HQL_API IHqlExpression * queryLocation(IHqlExpression * expr)
             return best;
         if (kind == annotate_location)
             return expr;
-        if (kind == annotate_symbol)
-            return expr;
-//            best = expr;
+        best = expr;
         expr = expr->queryBody(true);
     }
 }

ecl/hqlcpp/hqlalias.cpp

@@ -36,8 +36,6 @@ static bool isSubsetOf(IHqlExpression * search, IHqlExpression * expr)
             return true;
         if (expr->getOperator() != no_and)
             return false;
-        //MORE: Remove if think it is worth doing more work
-//        return false;
         //Check in order most likely to no recurse too deeply.
         if (isSubsetOf(search, expr->queryChild(1)))
             return true;