Don't reset current_scope to default scope if not explicitly set