Okay, take a look at the code I wrote in ConcretizeSyntax for SetBuiltin and MapBuiltin. You should do something similar there, while keeping the unparser simple.