The `OVERRIDES` setup seems a bit odd. Would be cleaner if everyting in `aggregators` and `OVERRIDES` was just the same kind of thing? Then `OVERRIDES` could go away?