added missing symbolo constraints to scope-related definitions