Refactored code to reflect new compareToBuilder() and equalsBuilder() APIs.