Further simplify unstoppable (#938)