Tweaks for 'public:' enclosing scope lookup