Just to answer my own questions for others who linked this discussion.
From MN140:
They understand: ‘When my body breaks up and my life has come to an end, everything that’s felt, since I no longer take pleasure in it, will become cool right here.’
‘kāyassa bhedā paraṁ maraṇā uddhaṁ jīvitapariyādānā idheva sabbavedayitāni anabhinanditāni sītībhavissantī’ti pajānāti.
It’s the same formula for nibbāna without remainder, clearly indicating that it refers to the death of an arahant.