simplify by two lines
fix dumb bug (remember to nilify outmoded transition context when done with it)