(#2, #3) Don't force global namespace, @class support