Use remaps in code gen