Abinadi Exemplified the Baptismal Covenant

In Mosiah 18 Alma explains the commitments associated with baptism in the Church of God. Part of that commitment is this:

 9 Yea, and are willing to mourn with those that mourn; yea, and comfort those that stand in need of comfort, and to stand as witnesses of God at all times and in all things, and in all places that ye may be in, even until death, that ye may be redeemed of God, and be numbered with those of the first resurrection, that ye may have eternal life—

 I wonder if he thought of Abinadi's recent demise as he said these words. Abinadi quite literally stood as a witness at all times, even until death. I think Alma's words here are a great tribute to Abinadi. I wonder if Alma knew of all the circumstances surrounding his demise. If he did know all that, I wonder if there was great emotion when he said those words, "even until death", and perhaps a moment of silence as he thought of his missionary, the one who stirred his own heart to repentance.