Minor changes to make Eclipse happy and less confusing hashCode generation