Some more cleanup in ConcreteASTVisitor