Rename enclosing_* to current_* for easy understanding
Move globals to run_context, destroy servers automatically
Merge branch 'noglobals'
Factor the "current_X" and "with_X" pattern better