Added the @MaybeHash and @OneWayHashWithSalt annotations.