Merge "Stop passing around dicts in validation resources"