I still see references to top-level roles.  Line 192 is one other example.