Index: src/SynTree/AddStmtVisitor.cc
===================================================================
--- src/SynTree/AddStmtVisitor.cc	(revision 8e9cbb2a92d8ecc9279635ef56d16d0beb03b78f)
+++ src/SynTree/AddStmtVisitor.cc	(revision e4d3cebea9b65b73a14d75ede42b6858dafb71f5)
@@ -9,7 +9,7 @@
 // Author           : Rob Schluntz
 // Created On       : Wed Jun 22 12:11:17 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 22 12:16:29 2016
-// Update Count     : 11
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:49:59 2016
+// Update Count     : 12
 //
 
@@ -75,9 +75,4 @@
 }
 
-void AddStmtVisitor::visit(ChooseStmt *switchStmt) {
-	visitStatementList( switchStmt->get_branches() );
-	maybeAccept( switchStmt->get_condition(), *this );
-}
-
 void AddStmtVisitor::visit(CaseStmt *caseStmt) {
 	visitStatementList( caseStmt->get_statements() );
Index: src/SynTree/AddStmtVisitor.h
===================================================================
--- src/SynTree/AddStmtVisitor.h	(revision 8e9cbb2a92d8ecc9279635ef56d16d0beb03b78f)
+++ src/SynTree/AddStmtVisitor.h	(revision e4d3cebea9b65b73a14d75ede42b6858dafb71f5)
@@ -9,7 +9,7 @@
 // Author           : Rob Schluntz
 // Created On       : Wed Jun 22 12:05:48 2016
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 22 12:12:05 2016
-// Update Count     : 7
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:50:32 2016
+// Update Count     : 8
 //
 
@@ -32,5 +32,4 @@
 	virtual void visit(ForStmt *forStmt);
 	virtual void visit(SwitchStmt *switchStmt);
-	virtual void visit(ChooseStmt *chooseStmt);
 	virtual void visit(CaseStmt *caseStmt);
 	virtual void visit(CatchStmt *catchStmt);
Index: src/SynTree/Mutator.cc
===================================================================
--- src/SynTree/Mutator.cc	(revision 8e9cbb2a92d8ecc9279635ef56d16d0beb03b78f)
+++ src/SynTree/Mutator.cc	(revision e4d3cebea9b65b73a14d75ede42b6858dafb71f5)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Apr 27 17:07:29 2016
-// Update Count     : 16
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:51:19 2016
+// Update Count     : 17
 //
 
@@ -130,14 +130,4 @@
 }
 
-Statement *Mutator::mutate( ChooseStmt *switchStmt ) {
-	switchStmt->set_condition( maybeMutate( switchStmt->get_condition(), *this ) );
-	mutateAll( switchStmt->get_branches(), *this );
-	return switchStmt;
-}
-
-Statement *Mutator::mutate( FallthruStmt *fallthruStmt ) {
-	return fallthruStmt;
-}
-
 Statement *Mutator::mutate( CaseStmt *caseStmt ) {
 	caseStmt->set_condition( maybeMutate( caseStmt->get_condition(), *this ) );
Index: src/SynTree/Mutator.h
===================================================================
--- src/SynTree/Mutator.h	(revision 8e9cbb2a92d8ecc9279635ef56d16d0beb03b78f)
+++ src/SynTree/Mutator.h	(revision e4d3cebea9b65b73a14d75ede42b6858dafb71f5)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 15:32:00 2016
-// Update Count     : 10
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:51:43 2016
+// Update Count     : 11
 //
 #include <cassert>
@@ -42,6 +42,4 @@
 	virtual Statement* mutate( ForStmt *forStmt );
 	virtual Statement* mutate( SwitchStmt *switchStmt );
-	virtual Statement* mutate( ChooseStmt *chooseStmt );
-	virtual Statement* mutate( FallthruStmt *fallthruStmt );
 	virtual Statement* mutate( CaseStmt *caseStmt );
 	virtual Statement* mutate( BranchStmt *branchStmt );
Index: src/SynTree/Statement.cc
===================================================================
--- src/SynTree/Statement.cc	(revision 8e9cbb2a92d8ecc9279635ef56d16d0beb03b78f)
+++ src/SynTree/Statement.cc	(revision e4d3cebea9b65b73a14d75ede42b6858dafb71f5)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu May 12 13:33:18 2016
-// Update Count     : 54
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:52:32 2016
+// Update Count     : 55
 //
 
@@ -206,37 +206,4 @@
 	for ( i = stmts.begin(); i != stmts.end(); i++)
 		(*i )->print( os, indent + 4 );
-}
-
-//ChooseStmt::ChooseStmt( std::list<Label> labels, Expression *condition, Statement *body ) {}
-ChooseStmt::ChooseStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_branches ):
-	Statement( _labels ), condition( _condition ), branches( _branches ) {
-}
-
-ChooseStmt::ChooseStmt( const ChooseStmt & other ):
-	Statement( other ), condition( maybeClone( other.condition ) ) {
-		cloneAll( other.branches, branches );
-}
-
-ChooseStmt::~ChooseStmt() {
-	delete condition;
-}
-
-void ChooseStmt::add_case( CaseStmt *c ) {}
-
-void ChooseStmt::print( std::ostream &os, int indent ) const {
-	os << "Choose on condition: ";
-	condition->print( os );
-	os << endl;
-
-	// branches
-	std::list<Statement *>::const_iterator i;
-	for ( i = branches.begin(); i != branches.end(); i++)
-		(*i )->print( os, indent + 4 );
-
-	//for_each( branches.begin(), branches.end(), mem_fun( bind1st(&Statement::print ), os ));
-}
-
-void FallthruStmt::print( std::ostream &os, int indent ) const {
-	os << string( indent, ' ' ) << "Fall-through statement" << endl;
 }
 
Index: src/SynTree/Statement.h
===================================================================
--- src/SynTree/Statement.h	(revision 8e9cbb2a92d8ecc9279635ef56d16d0beb03b78f)
+++ src/SynTree/Statement.h	(revision e4d3cebea9b65b73a14d75ede42b6858dafb71f5)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Dec 09 14:09:24 2015
-// Update Count     : 46
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:53:29 2016
+// Update Count     : 47
 //
 
@@ -149,37 +149,4 @@
 };
 
-class ChooseStmt : public Statement {
-  public:
-	ChooseStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &branches );
-	ChooseStmt( const ChooseStmt &other );
-	virtual ~ChooseStmt();
-
-	Expression *get_condition() { return condition; }
-	void set_condition( Expression *newValue ) { condition = newValue; }
-
-	std::list<Statement *>& get_branches() { return branches; }
-	void add_case( CaseStmt * );
-
-	virtual void accept( Visitor &v ) { v.visit( this ); }
-	virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-
-	virtual ChooseStmt *clone() const { return new ChooseStmt( *this ); }
-	virtual void print( std::ostream &os, int indent = 0 ) const;
-  private:
-	Expression *condition;
-	std::list<Statement *> branches; // should be list of CaseStmt
-};
-
-class FallthruStmt : public Statement {
-  public:
-	FallthruStmt( std::list<Label> labels ) : Statement( labels ) { }
-
-	virtual void accept( Visitor &v ) { v.visit( this ); }
-	virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-
-	virtual FallthruStmt *clone() const { return new FallthruStmt( *this ); }
-	virtual void print( std::ostream &os, int indent = 0 ) const;
-};
-
 class CaseStmt : public Statement {
   public:
Index: src/SynTree/SynTree.h
===================================================================
--- src/SynTree/SynTree.h	(revision 8e9cbb2a92d8ecc9279635ef56d16d0beb03b78f)
+++ src/SynTree/SynTree.h	(revision e4d3cebea9b65b73a14d75ede42b6858dafb71f5)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 15:31:36 2016
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:54:02 2016
+// Update Count     : 6
 //
 
@@ -45,6 +45,4 @@
 class ForStmt;
 class SwitchStmt;
-class ChooseStmt;
-class FallthruStmt;
 class CaseStmt;
 class BranchStmt;
Index: src/SynTree/Visitor.cc
===================================================================
--- src/SynTree/Visitor.cc	(revision 8e9cbb2a92d8ecc9279635ef56d16d0beb03b78f)
+++ src/SynTree/Visitor.cc	(revision e4d3cebea9b65b73a14d75ede42b6858dafb71f5)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Apr 27 17:07:40 2016
-// Update Count     : 18
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:54:39 2016
+// Update Count     : 19
 //
 
@@ -112,11 +112,4 @@
 }
 
-void Visitor::visit( ChooseStmt *switchStmt ) {
-	maybeAccept( switchStmt->get_condition(), *this );
-	acceptAll( switchStmt->get_branches(), *this );
-}
-
-void Visitor::visit( FallthruStmt *fallthruStmt ) {}
-
 void Visitor::visit( CaseStmt *caseStmt ) {
 	maybeAccept( caseStmt->get_condition(), *this );
Index: src/SynTree/Visitor.h
===================================================================
--- src/SynTree/Visitor.h	(revision 8e9cbb2a92d8ecc9279635ef56d16d0beb03b78f)
+++ src/SynTree/Visitor.h	(revision e4d3cebea9b65b73a14d75ede42b6858dafb71f5)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Apr 14 15:30:58 2016
-// Update Count     : 7
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Jul 12 17:55:09 2016
+// Update Count     : 8
 //
 
@@ -42,6 +42,4 @@
 	virtual void visit( ForStmt *forStmt );
 	virtual void visit( SwitchStmt *switchStmt );
-	virtual void visit( ChooseStmt *switchStmt );
-	virtual void visit( FallthruStmt *switchStmt );
 	virtual void visit( CaseStmt *caseStmt );
 	virtual void visit( BranchStmt *branchStmt );