Return a set in all cases.
Fix namespacing after recent introduction of new modules.