Simplify scope tracking, add support for tracking requires