[Glamtools] Change of direction in GWT 2.0 scoping