Fix more postrm logic.