Improved exit handling, about to defer invoke handling to interpreter for now...