Richer macro expansion

New metadata type that may be expanded as need be.