Removed old diagnostic code, simplified comparison methods, added
diagnostic messages to exceptions
Authored by: andy_rushton 2010-03-26
Parent: [r363]
Child: [r365]