Fix _POP_TOP_IMMORTAL, and use it in more places

Fix _POP_TOP_IMMORTAL, and use it in more places #709