cleanup, simplified event callbacks, step now consumes branch-skipped instructions