St. Thomas Aquinas (II-II:11:1) defines heresy: "a species of infidelity in men who, having professed the faith of Christ, corrupt its dogmas". "The right Christian faith consists in giving one's voluntary assent to Christ in all that truly belongs to His teaching. There are,therefore,two ways of deviating from Christianity: the one by refusing to believe in Christ Himself, which is the way of infidelity, common to Pagans and Jews; the other by restricting belief to certain points of Christ's doctrine selected and fashioned at pleasure, which is the way of heretics."
So, according to the Angelic Doctor, I would have been more inclusively accurate to say "infidels, heretics, and pagans", just to cover all the bases. It certainly wasn't my intent to blur the distinction between the three. Sorry if I caused you any confusion. BTW, the "voluntary assent" thing would pretty much preclude another Inquisition, but nice try.