Remove cases of '<? extends' in getClassifier() methods.
Fix bug in definition of equals (and other minor clean up).