Work on refactoring macros. Forgot containment property set on references.