add missing cases to scopewalker