Ensure macro vars are not defined
Promote internally-defined vars into top-level class