diff --git a/CHANGES.txt b/CHANGES.txt
index bda424b8f..8e8edc4bc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@ Jan 14, 2012
 
 * labels on tokens in left-recursive rules caused codegen exception.
 * leave start/stop char index alone in CommonTokenFactory; refers to original text.
+* reuse of -> label on multiple alts in rule caused dup ctx object defs.
 
 Jan 11, 2012
 
diff --git a/tool/src/org/antlr/v4/codegen/model/ListenerFile.java b/tool/src/org/antlr/v4/codegen/model/ListenerFile.java
index 04abcc8e6..6081041ff 100644
--- a/tool/src/org/antlr/v4/codegen/model/ListenerFile.java
+++ b/tool/src/org/antlr/v4/codegen/model/ListenerFile.java
@@ -5,8 +5,9 @@ import org.antlr.v4.tool.Grammar;
 import org.antlr.v4.tool.Rule;
 import org.antlr.v4.tool.ast.ActionAST;
 
-import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /** A model object representing a parse tree listener file.
  *  These are the rules specific events triggered by a parse tree visitor.
@@ -14,7 +15,7 @@ import java.util.List;
 public class ListenerFile extends OutputFile {
 	public String grammarName;
 	public String parserName;
-	public List<String> listenerNames = new ArrayList<String>();
+	public Set<String> listenerNames = new HashSet<String>();
 //	public List<String> ruleNames = new ArrayList<String>();
 
 	@ModelElement public Action header;
diff --git a/tool/src/org/antlr/v4/codegen/model/RuleFunction.java b/tool/src/org/antlr/v4/codegen/model/RuleFunction.java
index aa1986a08..f6154d1d6 100644
--- a/tool/src/org/antlr/v4/codegen/model/RuleFunction.java
+++ b/tool/src/org/antlr/v4/codegen/model/RuleFunction.java
@@ -49,7 +49,6 @@ public class RuleFunction extends OutputModelObject {
 	public String ctxType;
 	public Collection<String> ruleLabels;
 	public Collection<String> tokenLabels;
-	public List<String> elementsReferencedInRewrite;
 	public List<String> exceptions;
 	public ATNState startState;
 	public int index;
@@ -59,7 +58,7 @@ public class RuleFunction extends OutputModelObject {
 	@ModelElement public List<SrcOp> code;
 	@ModelElement public OrderedHashSet<Decl> locals; // TODO: move into ctx?
 	@ModelElement public StructDecl ruleCtx;
-	@ModelElement public List<AltLabelStructDecl> altLabelCtxs;
+	@ModelElement public Set<AltLabelStructDecl> altLabelCtxs;
 	@ModelElement public Map<String, Action> namedActions;
 	@ModelElement public Action finallyAction;
 	@ModelElement public List<SrcOp> postamble;
@@ -80,7 +79,7 @@ public class RuleFunction extends OutputModelObject {
 
 		List<String> labels = r.getAltLabels();
 		if ( labels!=null ) {
-			altLabelCtxs = new ArrayList<AltLabelStructDecl>();
+			altLabelCtxs = new HashSet<AltLabelStructDecl>();
 			for (String label : labels) {
 				altLabelCtxs.add(new AltLabelStructDecl(factory, r, label));
 			}
diff --git a/tool/src/org/antlr/v4/codegen/model/decl/AltLabelStructDecl.java b/tool/src/org/antlr/v4/codegen/model/decl/AltLabelStructDecl.java
index ef8f21f24..0ccdbba80 100644
--- a/tool/src/org/antlr/v4/codegen/model/decl/AltLabelStructDecl.java
+++ b/tool/src/org/antlr/v4/codegen/model/decl/AltLabelStructDecl.java
@@ -39,4 +39,19 @@ public class AltLabelStructDecl extends StructDecl {
 		super(factory, r);
 		this.label = label;
 	}
+
+	@Override
+	public int hashCode() {
+		return label.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if ( obj == this ) return true;
+		if ( obj.hashCode() != this.hashCode() ) return false;
+		if ( obj instanceof AltLabelStructDecl ) {
+			return label.equals(((AltLabelStructDecl)obj).label);
+		}
+		return false;
+	}
 }