More cleanup work and a new Equality comparitor. 
8 files changed