Eliminate double classes

Hat tip, @wjbonner.