MAINT: metadata is now more self-referential