Merge "Add "fixups" for ids referenced in code"