@retronym Would it be possible for us to not invoke a class-based completer in the first place? How about we remember what package objects we have in sources when traversing compilation units in namer? That would obviate the need to do something and then undo that something.