Replace the data-macro-style sugar with a simpler resolve-based sugar