Backwards compat changes in Collage to fix relateditems macro