Fix HashCodeCombiner so that Types are hashed correctly