re-introduce state-transition optimisation for possibly_unblock
cosmetic(ish)
fix typo
get rid of unused imports