Add 'enter' state to 'after' condition.
Simplify 'after' initialization.