Use the same indexing logic for bench and micro
More reorganization, removed guaranteed duplicates
Add syntax-only policy files