Rewrite ignores to fix data race, use fewer maps