I've argued from the Church Fathers for a distinction (from St. Ambrose) between a washing from (the temporal punishment) due to sin through a "baptism" of desire, so such a one would not be punished in eternity (i.e. would end up in Limbo), but they cannot be crowned (aka enter the Kingdom of Heaven) without the character imparted by the Sacrament of Bapism. So I, with St. Ambrose, do believe in a "baptism" of desire that can remit the poena due to sin, but does not suffice for entry into the Kingdom of Heaven. Father Feeny would call that "justification" (vs. "salvation"). Xavier Nishant cited a number of post-Trent theologians (and I followed up and read De Lugo) who held, for instance, that infidels could be justified but not saved, so Father Feeney did not invent that distinction.
There's a clear distinction made by the Church Fathers between the different effects of Baptism, between the "washing" and the "crowning".