added scope rules, removed TODO
added scope rules, removed TODO

R=r
DELTA=26  (19 added, 0 deleted, 7 changed)
OCL=14358
CL=14386
abustany/go,abustany/go,abustany/go,abustany/go,abustany/go,abustany/go,abustany/go